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

This commit is contained in:
Chong Yidong 2007-01-20 21:03:39 +00:00
parent 49a17db31c
commit 5fc6520d96

View file

@ -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);
}