[Emacs-diffs] Changes to emacs/src/window.c,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/11/27 16:00:59

Index: window.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/window.c,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -b -r1.566 -r1.567
--- window.c    25 Nov 2006 04:18:11 -0000      1.566
+++ window.c    27 Nov 2006 16:00:59 -0000      1.567
@@ -3267,8 +3267,7 @@
   int count = SPECPDL_INDEX ();
 #ifdef HAVE_WINDOW_SYSTEM
   struct frame *f = XFRAME (w->frame);
-  Display_Info *dpyinfo = (f && FRAME_X_OUTPUT (f)) ?
-    FRAME_X_DISPLAY_INFO (f) : NULL;
+  Display_Info *dpyinfo;
 #endif
 
   w->buffer = buffer;
@@ -3352,7 +3351,9 @@
 
 #ifdef HAVE_WINDOW_SYSTEM
   BLOCK_INPUT;
-  if (dpyinfo && EQ (window, dpyinfo->mouse_face_window))
+  if (f && FRAME_X_OUTPUT (f)
+      && (dpyinfo = FRAME_X_DISPLAY_INFO (f))
+      && EQ (window, dpyinfo->mouse_face_window))
     clear_mouse_face (dpyinfo);
   UNBLOCK_INPUT;
 #endif