summaryrefslogtreecommitdiff
path: root/src/xfns.c
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2025-01-19 04:59:22 +0100
committerStefan Kangas <stefankangas@gmail.com>2025-01-19 14:29:41 +0100
commit251e3d2654ae8e5fdee4624d9af93fb9c0e1b698 (patch)
tree5058c941d114e9b194310856b5351514e1b09bb5 /src/xfns.c
parent7362f9f75d5aca1c97f920531dd62763918ba5fe (diff)
downloademacs-251e3d2654ae8e5fdee4624d9af93fb9c0e1b698.tar.gz
emacs-251e3d2654ae8e5fdee4624d9af93fb9c0e1b698.tar.bz2
emacs-251e3d2654ae8e5fdee4624d9af93fb9c0e1b698.zip
Replace call[1-8] with calln
Since the introduction of the 'calln' macro, the 'call1', 'call2', ..., 'call8' macros are just aliases for the former. This is slightly misleading and potentially unhelpful. The number of arguments N can also easily go out-of-synch with the used alias callN. There is no reason not to replace these aliases with using 'calln' directly. To reduce the risk for mistakes, the tool Coccinelle was used to make these changes. See <https://coccinelle.gitlabpages.inria.fr/website/>. * src/alloc.c, src/androidvfs.c, src/androidfns.c, src/buffer.c: * src/callint.c, src/callproc.c, src/casefiddle.c, src/charset.c: * src/chartab.c, src/cmds.c, src/coding.c, src/composite.c: * src/data.c, src/dbusbind.c, src/dired.c, src/doc.c: * src/emacs.c, src/eval.c, src/fileio.c, src/filelock.c: * src/fns.c, src/frame.c, src/gtkutil.c, src/haikufns.c: * src/haikumenu.c, src/image.c, src/insdel.c, src/intervals.c: * src/keyboard.c, src/keymap.c, src/lisp.h, src/lread.c: * src/minibuf.c, src/nsfns.m, src/nsselect.m, src/pgtkfns.c: * src/pgtkselect.c, src/print.c, src/process.c, src/sort.c: * src/syntax.c, src/textconv.c, src/textprop.c, src/undo.c: * src/w32fns.c, src/window.c, src/xfaces.c, src/xfns.c: * src/xmenu.c, src/xselect.c, src/xterm.c: Replace all uses of 'call1', 'call2', ..., 'call8' with 'calln'.
Diffstat (limited to 'src/xfns.c')
-rw-r--r--src/xfns.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/xfns.c b/src/xfns.c
index b4d08bfc202..f0207ebbcee 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -8672,7 +8672,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo, Lisp_Object parms)
{
Lisp_Object bg = Fframe_parameter (frame, Qbackground_color);
- call2 (Qface_set_after_frame_default, frame, Qnil);
+ calln (Qface_set_after_frame_default, frame, Qnil);
if (!EQ (bg, Fframe_parameter (frame, Qbackground_color)))
{
@@ -8844,7 +8844,7 @@ x_hide_tip (bool delete)
{
if (!NILP (tip_timer))
{
- call1 (Qcancel_timer, tip_timer);
+ calln (Qcancel_timer, tip_timer);
tip_timer = Qnil;
}
@@ -9071,7 +9071,7 @@ Text larger than the specified size is clipped. */)
tip_f = XFRAME (tip_frame);
if (!NILP (tip_timer))
{
- call1 (Qcancel_timer, tip_timer);
+ calln (Qcancel_timer, tip_timer);
tip_timer = Qnil;
}
@@ -9110,11 +9110,11 @@ Text larger than the specified size is clipped. */)
}
else
tip_last_parms =
- call2 (Qassq_delete_all, parm, tip_last_parms);
+ calln (Qassq_delete_all, parm, tip_last_parms);
}
else
tip_last_parms =
- call2 (Qassq_delete_all, parm, tip_last_parms);
+ calln (Qassq_delete_all, parm, tip_last_parms);
}
/* Now check if every parameter in what is left of
@@ -9296,8 +9296,7 @@ Text larger than the specified size is clipped. */)
start_timer:
/* Let the tip disappear after timeout seconds. */
- tip_timer = call3 (Qrun_at_time, timeout, Qnil,
- Qx_hide_tip);
+ tip_timer = calln (Qrun_at_time, timeout, Qnil, Qx_hide_tip);
return unbind_to (count, Qnil);
}