procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix last change in editfns.c

Browse source 
* src/editfns.c (Freplace_buffer_contents): Fix last change: always
call buffer modification hooks, even if nothing was deleted/inserted.
(bug#32237)
This commit is contained in:
Eli Zaretskii 2018-07-21 22:27:33 +03:00
parent 671dc5a51e
commit 47f75b1ba0
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/editfns.c
View file

@ -3257,9 +3257,7 @@ differences between the two buffers. */)
for (l = size_a; l > k && !bit_is_set (ctx.deletions, l - 1); l--)
;
to = BEGV + l;
/* If k >= l, it means nothing needs to be deleted. */
if (k < l)
prepare_to_modify_buffer (from, to, NULL);
prepare_to_modify_buffer (from, to, NULL);
specbind (Qinhibit_modification_hooks, Qt);
modification_hooks_inhibited = true;
}
@ -3310,16 +3308,11 @@ differences between the two buffers. */)
SAFE_FREE ();
rbc_quitcounter = 0;
if (modification_hooks_inhibited && from <= to)
if (modification_hooks_inhibited)
{
ptrdiff_t updated_to = to + ZV - BEGV - size_a;
/* Only call after-change-functions if something was actually
inserted. */
if (from < updated_to)
{
signal_after_change (from, to - from, updated_to - from);
update_compositions (from, updated_to, CHECK_INSIDE);
}
signal_after_change (from, to - from, updated_to - from);
update_compositions (from, updated_to, CHECK_INSIDE);
}
return Qnil;