mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-04 19:10:37 -08:00
(Fcombine_after_change_execute): Return nil, not junk.
If nothing to do, return immediately. (syms_of_insdel): Initialize combine_after_change_buffer.
This commit is contained in:
parent
63b896163c
commit
101e446fa0
1 changed files with 5 additions and 2 deletions
|
|
@ -2570,12 +2570,14 @@ DEFUN ("combine-after-change-execute", Fcombine_after_change_execute,
|
|||
"This function is for use internally in `combine-after-change-calls'.")
|
||||
()
|
||||
{
|
||||
register Lisp_Object val;
|
||||
int count = specpdl_ptr - specpdl;
|
||||
int beg, end, change;
|
||||
int begpos, endpos;
|
||||
Lisp_Object tail;
|
||||
|
||||
if (NILP (combine_after_change_list))
|
||||
return Qnil;
|
||||
|
||||
record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
|
||||
|
||||
Fset_buffer (combine_after_change_buffer);
|
||||
|
|
@ -2633,7 +2635,7 @@ DEFUN ("combine-after-change-execute", Fcombine_after_change_execute,
|
|||
Vcombine_after_change_calls);
|
||||
signal_after_change (begpos, endpos - begpos - change, endpos - begpos);
|
||||
|
||||
return unbind_to (count, val);
|
||||
return unbind_to (count, Qnil);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -2641,6 +2643,7 @@ syms_of_insdel ()
|
|||
{
|
||||
staticpro (&combine_after_change_list);
|
||||
combine_after_change_list = Qnil;
|
||||
combine_after_change_buffer = Qnil;
|
||||
|
||||
DEFVAR_BOOL ("check-markers-debug-flag", &check_markers_debug_flag,
|
||||
"Non-nil means enable debugging checks for invalid marker positions.");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue