Merge from origin/emacs-26

e133b63 (origin/emacs-26) Avoid adverse side effects of fixing bug#21824
cc8f334 Document changes called out in NEWS
20ecc52 ; * etc/NEWS: Document recent change in 'thing-at-point'.
1fc5283 ; INSTALL: Fix a typo in the last commit.
24f240d Tiny doc updates re yum/dnf etc
41c2d25 Remove unused variable
1e3b3fa Fix (thing-at-point 'list) regression (Bug#31772)
219893a Clarify meaning of '*'
41cdda2 * etc/PROBLEMS: Document Ubuntu 16.04 issue.
1c22f03 Increase default value for imenu-auto-rescan-maxout
ee84389 Improve recent change to ELisp manual
ff374e4 * doc/lispref/display.texi (SVG Images): Improve wording.
3a0caf6 * doc/lispref/display.texi (SVG Images): Fix a typo.  (Bug#32...

Conflicts:
	doc/lispref/lists.texi
	etc/NEWS

1 files changed, 6 insertions, 18 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 878844dd020..1f18dbd11a8 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4516,23 +4516,6 @@ report_overlay_modification (Lisp_Object start, Lisp_Object end, bool after,
     Lisp_Object *copy;
     ptrdiff_t i;
 
-    if (size)
-      {
-        Lisp_Object ovl
-          = XVECTOR (last_overlay_modification_hooks)->contents[1];
-
-        /* If the buffer of the first overlay in the array doesn't
-           match the current buffer, then these modification hooks
-           should not be run in this buffer.  This could happen when
-           some code calls some insdel functions, such as del_range_1,
-           with the PREPARE argument false -- in that case this
-           function is never called to record the overlay modification
-           hook functions in the last_overlay_modification_hooks
-           array, so anything we find there is not ours.  */
-        if (XMARKER (OVERLAY_START (ovl))->buffer != current_buffer)
-          return;
-      }
-
     USE_SAFE_ALLOCA;
     SAFE_ALLOCA_LISP (copy, size);
     memcpy (copy, XVECTOR (last_overlay_modification_hooks)->contents,
@@ -4543,7 +4526,12 @@ report_overlay_modification (Lisp_Object start, Lisp_Object end, bool after,
         Lisp_Object prop_i, overlay_i;
         prop_i = copy[i++];
         overlay_i = copy[i++];
-        call_overlay_mod_hooks (prop_i, overlay_i, after, arg1, arg2, arg3);
+        /* It is possible that the recorded overlay has been deleted
+           (which makes it's markers' buffers be nil), or that (due to
+           some bug) it belongs to a different buffer.  Only run this
+           hook if the overlay belongs to the current buffer.  */
+        if (XMARKER (OVERLAY_START (overlay_i))->buffer == current_buffer)
+          call_overlay_mod_hooks (prop_i, overlay_i, after, arg1, arg2, arg3);
       }
 
     SAFE_FREE ();