From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 20 Jan 2007 21:03:39 +0000 (+0000)
Subject: (set_window_buffer): Revert 2006-11-22 change.
X-Git-Tag: emacs-pretest-22.0.93~61
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fc6520d964f60a8e3e34ba511841d3073f224b0;p=emacs.git

(set_window_buffer): Revert 2006-11-22 change.
---

diff --git a/src/window.c b/src/window.c
index d052a5786dc..0a38a9a30f8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3266,10 +3266,6 @@ set_window_buffer (window, buffer, run_hooks_p, keep_margins_p)
   struct window *w = XWINDOW (window);
   struct buffer *b = XBUFFER (buffer);
   int count = SPECPDL_INDEX ();
-#ifdef HAVE_WINDOW_SYSTEM
-  struct frame *f = XFRAME (w->frame);
-  Display_Info *dpyinfo;
-#endif
 
   w->buffer = buffer;
 
@@ -3350,15 +3346,6 @@ set_window_buffer (window, buffer, run_hooks_p, keep_margins_p)
 	call1 (Vrun_hooks, Qwindow_configuration_change_hook);
     }
 
-#ifdef HAVE_WINDOW_SYSTEM
-  BLOCK_INPUT;
-  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
-
   unbind_to (count, Qnil);
 }