From 7cb5364ef5334de0fb1bc2e470bea450e4567d24 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sat, 27 Apr 2019 15:22:11 -0400 Subject: 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. --- src/xdisp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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) is currently hidden to avoid Bug#30519. */ || (!hlinfo->mouse_face_hidden && OVERLAYP (hlinfo->mouse_face_overlay) - && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay))) + /* It's possible the overlay was deleted (Bug#35273). */ + && XMARKER (OVERLAY_START (hlinfo->mouse_face_overlay))->buffer + && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay))) { /* Find the highest priority overlay with a mouse-face. */ Lisp_Object overlay = Qnil; -- cgit v1.2.1