Commit 56784393 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix bug #9902 with crash caused by clearing mouse highlight.

 src/xdisp.c (note_mouse_highlight): Don't clear mouse highlight if
 hlinfo->mouse_face_window is nil.
parent 21b72067
2011-10-29 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (note_mouse_highlight): Don't clear mouse highlight if
hlinfo->mouse_face_window is nil. (Bug#9902)
2011-10-29 Andreas Schwab <schwab@linux-m68k.org> 2011-10-29 Andreas Schwab <schwab@linux-m68k.org>
* minibuf.c (read_minibuf_noninteractive): Allow reading empty * minibuf.c (read_minibuf_noninteractive): Allow reading empty
......
...@@ -26835,14 +26835,14 @@ note_mouse_highlight (struct frame *f, int x, int y) ...@@ -26835,14 +26835,14 @@ note_mouse_highlight (struct frame *f, int x, int y)
/* Which window is that in? */ /* Which window is that in? */
window = window_from_coordinates (f, x, y, &part, 1); window = window_from_coordinates (f, x, y, &part, 1);
   
/* If displaying active text in another window, clear that. */ if (!NILP (hlinfo->mouse_face_window)
if (! EQ (window, hlinfo->mouse_face_window) /* If displaying active text in another window, clear that. */
/* Also clear if we move out of text area in same window. */ && (!EQ (window, hlinfo->mouse_face_window)
|| (!NILP (hlinfo->mouse_face_window) /* Also clear if we move out of text area in same window. */
&& !NILP (window) || (!NILP (window)
&& part != ON_TEXT && part != ON_TEXT
&& part != ON_MODE_LINE && part != ON_MODE_LINE
&& part != ON_HEADER_LINE)) && part != ON_HEADER_LINE)))
clear_mouse_face (hlinfo); clear_mouse_face (hlinfo);
   
/* Not on a window -> return. */ /* Not on a window -> return. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment