[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100635: Fix use of uninitialized var (backport from trunk).

[Chong Yidong]

------------------------------------------------------------
revno: 100635
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Mon 2012-01-09 17:35:21 +0800
message:
  Fix use of uninitialized var (backport from trunk).
  
  * xdisp.c (note_mouse_highlight): Fix use of uninitialized var.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-01-09 09:27:02 +0000
+++ b/src/ChangeLog     2012-01-09 09:35:21 +0000
@@ -1,3 +1,7 @@
+2012-01-09  Chong Yidong  <address@hidden>
+
+       * xdisp.c (note_mouse_highlight): Fix use of uninitialized var.
+
 2012-01-09  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-01-09 09:27:02 +0000
+++ b/src/xdisp.c       2012-01-09 09:35:21 +0000
@@ -23518,11 +23518,14 @@
   /* Which window is that in?  */
   window = window_from_coordinates (f, x, y, &part, 0, 0, 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 (! EQ (window, dpyinfo->mouse_face_window)
-      || (part != ON_TEXT && part != ON_MODE_LINE && part != ON_HEADER_LINE
-         && !NILP (dpyinfo->mouse_face_window)))
+  /* 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))
     clear_mouse_face (dpyinfo);
 
   /* Not on a window -> return.  */