mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-13 01:32:21 -07:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/igc

Browse source
This commit is contained in:
Gerd Möllmann 2025-01-19 15:52:10 +01:00
commit c19d702b3b
146 changed files with 2274 additions and 1059 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/buffer.c
View file

@ -504,7 +504,7 @@ See also `find-buffer-visiting'. */)
handler = Ffind_file_name_handler (filename, Qget_file_buffer);
if (!NILP (handler))
{
Lisp_Object handled_buf = call2 (handler, Qget_file_buffer,
Lisp_Object handled_buf = calln (handler, Qget_file_buffer,
filename);
return BUFFERP (handled_buf) ? handled_buf : Qnil;
}
@ -559,7 +559,7 @@ run_buffer_list_update_hook (struct buffer *buf)
{
eassert (buf);
if (! (NILP (Vrun_hooks) || buf->inhibit_buffer_hooks))
call1 (Vrun_hooks, Qbuffer_list_update_hook);
calln (Vrun_hooks, Qbuffer_list_update_hook);
}
DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 2, 0,
@ -1711,8 +1711,7 @@ This does not change the name of the visited file (if any). */)
run_buffer_list_update_hook (current_buffer);
call2 (Quniquify__rename_buffer_advice,
requestedname, unique);
calln (Quniquify__rename_buffer_advice, requestedname, unique);
/* Refetch since that last call may have done GC. */
return BVAR (current_buffer, name);
@ -1752,7 +1751,7 @@ exists, return the buffer `*scratch*' (creating it if necessary). */)
if (candidate_buffer (buf, buffer)
/* If the frame has a buffer_predicate, disregard buffers that
don't fit the predicate. */
&& (NILP (pred) || !NILP (call1 (pred, buf))))
&& (NILP (pred) || !NILP (calln (pred, buf))))
{
if (!NILP (visible_ok)
|| NILP (Fget_buffer_window (buf, Qvisible)))
@ -1768,7 +1767,7 @@ exists, return the buffer `*scratch*' (creating it if necessary). */)
if (candidate_buffer (buf, buffer)
/* If the frame has a buffer_predicate, disregard buffers that
don't fit the predicate. */
&& (NILP (pred) || !NILP (call1 (pred, buf))))
&& (NILP (pred) || !NILP (calln (pred, buf))))
{
if (!NILP (visible_ok)
|| NILP (Fget_buffer_window (buf, Qvisible)))
@ -1938,7 +1937,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
{
/* Ask whether to kill the buffer, and exit if the user says
"no". */
if (NILP (call1 (Qkill_buffer__possibly_save, buffer)))
if (NILP (calln (Qkill_buffer__possibly_save, buffer)))
return unbind_to (count, Qnil);
/* Recheck modified. */
modified = BUF_MODIFF (b) > BUF_SAVE_MODIFF (b);
@ -4247,9 +4246,9 @@ call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, bool after,
while (CONSP (list))
{
if (NILP (arg3))
call4 (XCAR (list), overlay, after ? Qt : Qnil, arg1, arg2);
calln (XCAR (list), overlay, after ? Qt : Qnil, arg1, arg2);
else
call5 (XCAR (list), overlay, after ? Qt : Qnil, arg1, arg2, arg3);
calln (XCAR (list), overlay, after ? Qt : Qnil, arg1, arg2, arg3);
list = XCDR (list);
}
}
@ -5092,19 +5091,18 @@ defvar_per_buffer (const struct Lisp_Fwd *fwd, const char *namestring)
static Lisp_Object
make_lispy_itree_node (const struct itree_node *node)
{
return listn (12,
intern (":begin"),
make_fixnum (node->begin),
intern (":end"),
make_fixnum (node->end),
intern (":limit"),
make_fixnum (node->limit),
intern (":offset"),
make_fixnum (node->offset),
intern (":rear-advance"),
node->rear_advance ? Qt : Qnil,
intern (":front-advance"),
node->front_advance ? Qt : Qnil);
return list (intern (":begin"),
make_fixnum (node->begin),
intern (":end"),
make_fixnum (node->end),
intern (":limit"),
make_fixnum (node->limit),
intern (":offset"),
make_fixnum (node->offset),
intern (":rear-advance"),
node->rear_advance ? Qt : Qnil,
intern (":front-advance"),
node->front_advance ? Qt : Qnil);
}
static Lisp_Object