mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

Prefer calln to CALLN where applicable

Browse source 
* src/callint.c (read_file_name):
* src/comp.c (CALL0I, CALL1I, CALL2I, CALL4I, declare_imported_func):
* src/data.c (Ffset, notify_variable_watchers):
* src/eval.c (Ffuncall_with_delayed_message):
* src/keymap.c (Fdescribe_buffer_bindings):
* src/minibuf.c (Fread_buffer, Fcompleting_read):
* src/pdumper.c (Fdump_emacs_portable):
* src/print.c (print_vectorlike_unreadable):
* src/treesit.c (treesit_traverse_match_predicate)
(treesit_build_sparse_tree): Prefer calln to CALLN.
This commit is contained in:
Stefan Kangas 2025-01-14 00:16:40 +01:00
parent f0e63558bd
commit 383de5c3f6
9 changed files with 26 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/callint.c
View file

@ -228,7 +228,7 @@ static Lisp_Object
read_file_name (Lisp_Object default_filename, Lisp_Object mustmatch,
Lisp_Object initial, Lisp_Object predicate)
{
return CALLN (Ffuncall, Qread_file_name,
return calln (Qread_file_name,
callint_message, Qnil, default_filename,
mustmatch, initial, predicate);
}

10
src/comp.c
View file

@ -504,19 +504,19 @@ load_gccjit_if_necessary (bool mandatory)
/* Like call0 but stringify and intern. */
#define CALL0I(fun) \
CALLN (Ffuncall, intern_c_string (STR (fun)))
calln (intern_c_string (STR (fun)))
/* Like call1 but stringify and intern. */
#define CALL1I(fun, arg) \
CALLN (Ffuncall, intern_c_string (STR (fun)), arg)
calln (intern_c_string (STR (fun)), arg)
/* Like call2 but stringify and intern. */
#define CALL2I(fun, arg1, arg2) \
CALLN (Ffuncall, intern_c_string (STR (fun)), arg1, arg2)
calln (intern_c_string (STR (fun)), arg1, arg2)
/* Like call4 but stringify and intern. */
#define CALL4I(fun, arg1, arg2, arg3, arg4) \
CALLN (Ffuncall, intern_c_string (STR (fun)), arg1, arg2, arg3, arg4)
calln (intern_c_string (STR (fun)), arg1, arg2, arg3, arg4)
#define DECL_BLOCK(name, func) \
gcc_jit_block *(name) = \
@ -1016,7 +1016,7 @@ declare_imported_func (Lisp_Object subr_sym, gcc_jit_type *ret_type,
/* String containing the function ptr name. */
Lisp_Object f_ptr_name =
CALLN (Ffuncall, intern_c_string ("comp-c-func-name"),
calln (intern_c_string ("comp-c-func-name"),
subr_sym, make_string ("R", 1));
gcc_jit_type *f_ptr_type =

4
src/data.c
View file

@ -911,7 +911,7 @@ signal a `cyclic-function-indirection' error. */)
if (!NILP (Vnative_comp_enable_subr_trampolines)
&& SUBRP (function)
&& !NATIVE_COMP_FUNCTIONP (function))
CALLN (Ffuncall, Qcomp_subr_trampoline_install, symbol);
calln (Qcomp_subr_trampoline_install, symbol);
#endif
set_symbol_function (symbol, definition);
@ -1910,7 +1910,7 @@ notify_variable_watchers (Lisp_Object symbol,
funcall_subr (XSUBR (watcher), ARRAYELTS (args), args);
}
else
CALLN (Ffuncall, watcher, symbol, newval, operation, where);
calln (watcher, symbol, newval, operation, where);
}
unbind_to (count, Qnil);

2
src/eval.c
View file

@ -1169,7 +1169,7 @@ is not displayed. */)
xstrdup (SSDATA (message)));
record_unwind_protect_ptr (with_delayed_message_cancel, timer);
Lisp_Object result = CALLN (Ffuncall, function);
Lisp_Object result = calln (function);
return unbind_to (count, result);
}

30
src/keymap.c
View file

@ -2894,8 +2894,7 @@ You type Translation\n\
if (!NILP (Vkey_translation_map))
{
Lisp_Object msg = build_unibyte_string ("Key translations");
CALLN (Ffuncall,
Qhelp__describe_map_tree,
calln (Qhelp__describe_map_tree,
Vkey_translation_map, Qnil, Qnil, prefix,
msg, nomenu, Qt, Qnil, Qnil, buffer);
}
@ -2908,8 +2907,7 @@ You type Translation\n\
if (!NILP (start1))
{
Lisp_Object msg = build_unibyte_string ("\f\nOverriding Bindings");
CALLN (Ffuncall,
Qhelp__describe_map_tree,
calln (Qhelp__describe_map_tree,
start1, Qt, shadow, prefix,
msg, nomenu, Qnil, Qnil, Qnil, buffer);
shadow = Fcons (start1, shadow);
@ -2921,8 +2919,7 @@ You type Translation\n\
if (!NILP (start1))
{
Lisp_Object msg = build_unibyte_string ("\f\nOverriding Bindings");
CALLN (Ffuncall,
Qhelp__describe_map_tree,
calln (Qhelp__describe_map_tree,
start1, Qt, shadow, prefix,
msg, nomenu, Qnil, Qnil, Qnil, buffer);
shadow = Fcons (start1, shadow);
@ -2944,8 +2941,7 @@ You type Translation\n\
if (!NILP (start1))
{
Lisp_Object msg = build_unibyte_string ("\f\n`keymap' Property Bindings");
CALLN (Ffuncall,
Qhelp__describe_map_tree,
calln (Qhelp__describe_map_tree,
start1, Qt, shadow, prefix,
msg, nomenu, Qnil, Qnil, Qnil, buffer);
shadow = Fcons (start1, shadow);
@ -2977,8 +2973,7 @@ You type Translation\n\
*p = 0;
Lisp_Object msg = build_unibyte_string (title);
CALLN (Ffuncall,
Qhelp__describe_map_tree,
calln (Qhelp__describe_map_tree,
maps[i], Qt, shadow, prefix,
msg, nomenu, Qnil, Qnil, Qnil, buffer);
shadow = Fcons (maps[i], shadow);
@ -2995,16 +2990,14 @@ You type Translation\n\
CALLN (Fformat,
build_unibyte_string ("\f\n`%s' Major Mode Bindings"),
XBUFFER (buffer)->major_mode_);
CALLN (Ffuncall,
Qhelp__describe_map_tree,
calln (Qhelp__describe_map_tree,
start1, Qt, shadow, prefix,
msg, nomenu, Qnil, Qnil, Qnil, buffer);
}
else
{
Lisp_Object msg = build_unibyte_string ("\f\n`local-map' Property Bindings");
CALLN (Ffuncall,
Qhelp__describe_map_tree,
calln (Qhelp__describe_map_tree,
start1, Qt, shadow, prefix,
msg, nomenu, Qnil, Qnil, Qnil, buffer);
}
@ -3014,8 +3007,7 @@ You type Translation\n\
}
Lisp_Object msg = build_unibyte_string ("\f\nGlobal Bindings");
CALLN (Ffuncall,
Qhelp__describe_map_tree,
calln (Qhelp__describe_map_tree,
current_global_map, Qt, shadow, prefix,
msg, nomenu, Qnil, Qt, Qnil, buffer);
@ -3023,8 +3015,7 @@ You type Translation\n\
if (!NILP (KVAR (current_kboard, Vlocal_function_key_map)))
{
Lisp_Object msg = build_unibyte_string ("\f\nFunction key map translations");
CALLN (Ffuncall,
Qhelp__describe_map_tree,
calln (Qhelp__describe_map_tree,
KVAR (current_kboard, Vlocal_function_key_map), Qnil, Qnil, prefix,
msg, nomenu, Qt, Qnil, Qnil, buffer);
}
@ -3033,8 +3024,7 @@ You type Translation\n\
if (!NILP (KVAR (current_kboard, Vinput_decode_map)))
{
Lisp_Object msg = build_unibyte_string ("\f\nInput decoding map translations");
CALLN (Ffuncall,
Qhelp__describe_map_tree,
calln (Qhelp__describe_map_tree,
KVAR (current_kboard, Vinput_decode_map), Qnil, Qnil, prefix,
msg, nomenu, Qt, Qnil, Qnil, buffer);
}

6
src/minibuf.c
View file

@ -1553,8 +1553,7 @@ function, instead of the usual behavior. */)
STRING_MULTIBYTE (prompt));
}
prompt = CALLN (Ffuncall, Qformat_prompt,
prompt,
prompt = calln (Qformat_prompt, prompt,
CONSP (def) ? XCAR (def) : def);
}
@ -2040,8 +2039,7 @@ Completion ignores case if the ambient value of
See also `completing-read-function'. */)
(Lisp_Object prompt, Lisp_Object collection, Lisp_Object predicate, Lisp_Object require_match, Lisp_Object initial_input, Lisp_Object hist, Lisp_Object def, Lisp_Object inherit_input_method)
{
return CALLN (Ffuncall,
Fsymbol_value (Qcompleting_read_function),
return calln (Fsymbol_value (Qcompleting_read_function),
prompt, collection, predicate, require_match, initial_input,
hist, def, inherit_input_method);
}

2
src/pdumper.c
View file

@ -4156,7 +4156,7 @@ types. */)
error ("No other Lisp threads can be running when this function is called");
#ifdef HAVE_NATIVE_COMP
CALLN (Ffuncall, intern_c_string ("load--fixup-all-elns"));
calln (intern_c_string ("load--fixup-all-elns"));
#endif
check_pure_size ();

3
src/print.c
View file

@ -1680,8 +1680,7 @@ print_vectorlike_unreadable (Lisp_Object obj, Lisp_Object printcharfun,
record_unwind_current_buffer ();
set_buffer_internal (XBUFFER (Vprint__unreadable_callback_buffer));
}
Lisp_Object result = CALLN (Ffuncall, func, obj,
escapeflag? Qt: Qnil);
Lisp_Object result = calln (func, obj, escapeflag? Qt: Qnil);
unbind_to (count, Qnil);
if (!NILP (result))

6
src/treesit.c
View file

@ -3730,7 +3730,7 @@ treesit_traverse_match_predicate (TSTreeCursor *cursor, Lisp_Object pred,
&& !(SYMBOLP (pred) && !NILP (Fget (pred, Qtreesit_thing_symbol))))
{
Lisp_Object lisp_node = make_treesit_node (parser, node);
return !NILP (CALLN (Ffuncall, pred, lisp_node));
return !NILP (calln (pred, lisp_node));
}
else if (SYMBOLP (pred) && BASE_EQ (pred, Qnamed))
{
@ -3784,7 +3784,7 @@ treesit_traverse_match_predicate (TSTreeCursor *cursor, Lisp_Object pred,
return false;
Lisp_Object lisp_node = make_treesit_node (parser, node);
if (NILP (CALLN (Ffuncall, cdr, lisp_node)))
if (NILP (calln (cdr, lisp_node)))
return false;
return true;
@ -4053,7 +4053,7 @@ treesit_build_sparse_tree (TSTreeCursor *cursor, Lisp_Object parent,
TSNode node = ts_tree_cursor_current_node (cursor);
Lisp_Object lisp_node = make_treesit_node (parser, node);
if (!NILP (process_fn))
lisp_node = CALLN (Ffuncall, process_fn, lisp_node);
lisp_node = calln (process_fn, lisp_node);
Lisp_Object this = Fcons (lisp_node, Qnil);
Fsetcdr (parent, Fcons (this, Fcdr (parent)));