procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
src/xdisp.c (note_mouse_highlight): Don't clear mouse highlight if
 hlinfo->mouse_face_window is nil.
This commit is contained in:
Eli Zaretskii 2011-10-29 11:36:42 +02:00
parent 21b7206797
commit 567843934e
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
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>
* minibuf.c (read_minibuf_noninteractive): Allow reading empty

16
src/xdisp.c
View file

@ -26835,14 +26835,14 @@ note_mouse_highlight (struct frame *f, int x, int y)
/* Which window is that in? */
window = window_from_coordinates (f, x, y, &part, 1);
/* If displaying active text in another window, clear that. */
if (! EQ (window, hlinfo->mouse_face_window)
/* Also clear if we move out of text area in same window. */
|| (!NILP (hlinfo->mouse_face_window)
&& !NILP (window)
&& part != ON_TEXT
&& part != ON_MODE_LINE
&& part != ON_HEADER_LINE))
if (!NILP (hlinfo->mouse_face_window)
/* If displaying active text in another window, clear that. */
&& (!EQ (window, hlinfo->mouse_face_window)
/* Also clear if we move out of text area in same window. */
|| (!NILP (window)
&& part != ON_TEXT
&& part != ON_MODE_LINE
&& part != ON_HEADER_LINE)))
clear_mouse_face (hlinfo);
/* Not on a window -> return. */