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

[bpt/emacs.git] / src / xdisp.c

diff --git a/src/xdisp.c b/src/xdisp.c
index 22f7c2b..3cce801 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -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.  */