[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 7cb5364: Check if mouse_face_overlay was deleted
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-26 7cb5364: Check if mouse_face_overlay was deleted (Bug#35273) |
Date: |
Sun, 28 Apr 2019 08:44:53 -0400 (EDT) |
branch: emacs-26
commit 7cb5364ef5334de0fb1bc2e470bea450e4567d24
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
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(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index 0c3754a..aa6e1bd 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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 7cb5364: Check if mouse_face_overlay was deleted (Bug#35273),
Noam Postavsky <=