[Emacs-diffs] /srv/bzr/emacs/trunk r106220: * src/xdisp.c (note_mouse_highlight): Fix use of uninitialized var.

[Chong Yidong]

------------------------------------------------------------
revno: 106220
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2011-10-28 23:17:09 +0800
message:
  * src/xdisp.c (note_mouse_highlight): Fix use of uninitialized var.
  
  See:
  http://lists.gnu.org/archive/html/emacs-devel/2011-10/msg01202.html
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-28 14:34:06 +0000
+++ b/src/ChangeLog     2011-10-28 15:17:09 +0000
@@ -1,3 +1,7 @@
+2011-10-28  Chong Yidong  <address@hidden>
+
+       * xdisp.c (note_mouse_highlight): Fix use of uninitialized var.
+
 2011-10-28  Dan Nicolaescu  <address@hidden>
 
        * window.c (make_window): Initialize phys_cursor_on_p.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-10-19 11:46:17 +0000
+++ b/src/xdisp.c       2011-10-28 15:17:09 +0000
@@ -26835,11 +26835,14 @@
   /* Which window is that in?  */
   window = window_from_coordinates (f, x, y, &part, 1);
 
-  /* If we were displaying active text in another window, clear that.
-     Also clear if we move out of text area in same window.  */
+  /* If displaying active text in another window, clear that.  */
   if (! EQ (window, hlinfo->mouse_face_window)
-      || (part != ON_TEXT && part != ON_MODE_LINE && part != ON_HEADER_LINE
-         && !NILP (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))
     clear_mouse_face (hlinfo);
 
   /* Not on a window -> return.  */