From 564d811725596f15ecf543777e11504b47d2af86 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 6 Nov 2015 17:19:39 +0200 Subject: [PATCH] Don't invoke overlay modification hooks in wrong buffer * src/buffer.c (report_overlay_modification): When called with AFTER non-zero, don't invoke overlay modification hooks if the buffer recorded in last_overlay_modification_hooks is different from the current buffer. (Bug#21824) --- src/buffer.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/buffer.c b/src/buffer.c index 91e42dca2bf..c0179c7584e 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4481,6 +4481,23 @@ 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, -- 2.39.5