aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2007-01-20 21:03:39 +0000
committerChong Yidong2007-01-20 21:03:39 +0000
commit5fc6520d964f60a8e3e34ba511841d3073f224b0 (patch)
treead08a8bd290a216808d9cc6a4e12405a672b021b /src
parent49a17db31c6ce952f453a93676aeefcc93677e67 (diff)
downloademacs-5fc6520d964f60a8e3e34ba511841d3073f224b0.tar.gz
emacs-5fc6520d964f60a8e3e34ba511841d3073f224b0.zip
(set_window_buffer): Revert 2006-11-22 change.
Diffstat (limited to 'src')
-rw-r--r--src/window.c13
1 files changed, 0 insertions, 13 deletions
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)
3266 struct window *w = XWINDOW (window); 3266 struct window *w = XWINDOW (window);
3267 struct buffer *b = XBUFFER (buffer); 3267 struct buffer *b = XBUFFER (buffer);
3268 int count = SPECPDL_INDEX (); 3268 int count = SPECPDL_INDEX ();
3269#ifdef HAVE_WINDOW_SYSTEM
3270 struct frame *f = XFRAME (w->frame);
3271 Display_Info *dpyinfo;
3272#endif
3273 3269
3274 w->buffer = buffer; 3270 w->buffer = buffer;
3275 3271
@@ -3350,15 +3346,6 @@ set_window_buffer (window, buffer, run_hooks_p, keep_margins_p)
3350 call1 (Vrun_hooks, Qwindow_configuration_change_hook); 3346 call1 (Vrun_hooks, Qwindow_configuration_change_hook);
3351 } 3347 }
3352 3348
3353#ifdef HAVE_WINDOW_SYSTEM
3354 BLOCK_INPUT;
3355 if (f && FRAME_X_OUTPUT (f)
3356 && (dpyinfo = FRAME_X_DISPLAY_INFO (f))
3357 && EQ (window, dpyinfo->mouse_face_window))
3358 clear_mouse_face (dpyinfo);
3359 UNBLOCK_INPUT;
3360#endif
3361
3362 unbind_to (count, Qnil); 3349 unbind_to (count, Qnil);
3363} 3350}
3364 3351