aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoam Postavsky2019-04-27 15:22:11 -0400
committerNoam Postavsky2019-04-28 08:31:17 -0400
commit7cb5364ef5334de0fb1bc2e470bea450e4567d24 (patch)
treeb80143bfe8664d0cce096e2f05bb66c6d83cc2c7
parent531c74e2493cf54dc76238930bb93c6d7112ed3b (diff)
downloademacs-7cb5364ef5334de0fb1bc2e470bea450e4567d24.tar.gz
emacs-7cb5364ef5334de0fb1bc2e470bea450e4567d24.zip
Check if mouse_face_overlay was deleted (Bug#35273)
* src/xdisp.c (note_mouse_highlight): Check if the mouse_face_overlay actually points to a buffer, before calling mouse_face_overlay_overlaps on it.
-rw-r--r--src/xdisp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 0c3754a338f..aa6e1bd2df8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -31526,7 +31526,9 @@ note_mouse_highlight (struct frame *f, int x, int y)
31526 is currently hidden to avoid Bug#30519. */ 31526 is currently hidden to avoid Bug#30519. */
31527 || (!hlinfo->mouse_face_hidden 31527 || (!hlinfo->mouse_face_hidden
31528 && OVERLAYP (hlinfo->mouse_face_overlay) 31528 && OVERLAYP (hlinfo->mouse_face_overlay)
31529 && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay))) 31529 /* It's possible the overlay was deleted (Bug#35273). */
31530 && XMARKER (OVERLAY_START (hlinfo->mouse_face_overlay))->buffer
31531 && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay)))
31530 { 31532 {
31531 /* Find the highest priority overlay with a mouse-face. */ 31533 /* Find the highest priority overlay with a mouse-face. */
31532 Lisp_Object overlay = Qnil; 31534 Lisp_Object overlay = Qnil;