Mercurial > emacs
changeset 23646:595d8a052b71
(Fcombine_after_change_execute): Return nil, not junk.
If nothing to do, return immediately.
(syms_of_insdel): Initialize combine_after_change_buffer.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Thu, 05 Nov 1998 20:06:22 +0000 |
| parents | 2717722f5c32 |
| children | d87960db41e9 |
| files | src/insdel.c |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/insdel.c Thu Nov 05 19:31:09 1998 +0000 +++ b/src/insdel.c Thu Nov 05 20:06:22 1998 +0000 @@ -2570,12 +2570,14 @@ "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 @@ 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 @@ { 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.");