(verify_interval_modification): Don't run

modification-hooks if inhibit_modification_hooks.

diff --git a/src/ChangeLog b/src/ChangeLog
index 61fcbf13a62dcf32095825b220565677fd29348b..da8b012b3ae7a9d976858d188df643744a21dd1b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2001-09-11  Gerd Moellmann  <gerd@gnu.org>
 
+       * textprop.c (verify_interval_modification): Don't run
+       modification-hooks if inhibit_modification_hooks.
+
+       * dispnew.c (set_window_cursor_after_update): Fix code
+       finding glyph row containing cursor when cursor_in_echo_area
+       is >= 0.
+
        * xdisp.c (init_from_display_pos): Put some code in #if 0.
        (add_to_log): Use bcopy instead of strcpy.
        (init_from_display_pos): Use an explicit loop over bytes in

diff --git a/src/textprop.c b/src/textprop.c
index cf5ac5314e2742c9f28bb6b63d7988acde8726d9..0bb2d42cdca8fb2ffb8c7c70b9ed4c0b1a390bd8 100644 (file)
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1,5 +1,6 @@
 /* Interface code for dealing with text properties.
-   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1901,7 +1902,7 @@ verify_interval_modification (buf, start, end)
        interval_insert_in_front_hooks
          = textget (i->plist, Qinsert_in_front_hooks);
     }
-  else
+  else if (!inhibit_modification_hooks)
     {
       /* Loop over intervals on or next to START...END,
         collecting their hooks.  */