emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 47f75b1: Fix last change in editfns.c


From: Eli Zaretskii
Subject: [Emacs-diffs] emacs-26 47f75b1: Fix last change in editfns.c
Date: Sat, 21 Jul 2018 15:29:20 -0400 (EDT)

branch: emacs-26
commit 47f75b1ba0246b5d770fbb52e0fa3e00f9f83ffb
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix last change in editfns.c
    
    * src/editfns.c (Freplace_buffer_contents): Fix last change: always
    call buffer modification hooks, even if nothing was deleted/inserted.
    (bug#32237)
---
 src/editfns.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/editfns.c b/src/editfns.c
index cf596ae..a18a71e 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -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;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]