# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1164643259 0
# Node ID 23db4276ddf069cb73841eefbdeb00b26e6de738
# Parent  0a9d1a43ed269f7d9e689b5d21f639fdb0cd125d
(set_window_buffer): Refactor recent changes.

diff -r 0a9d1a43ed26 -r 23db4276ddf0 src/window.c
--- a/src/window.c	Mon Nov 27 16:00:46 2006 +0000
+++ b/src/window.c	Mon Nov 27 16:00:59 2006 +0000
@@ -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