Commit 596ae0cf authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(Fselect_window): Don't set OW->pointm if OW->buffer is nil.

(Fset_window_configuration): Set old selected window's pointm.
parent 4101e6fe
......@@ -1963,9 +1963,10 @@ before each command.")
if (EQ (window, selected_window))
return window;
set_marker_both (ow->pointm, ow->buffer,
BUF_PT (XBUFFER (ow->buffer)),
BUF_PT_BYTE (XBUFFER (ow->buffer)));
if (! NILP (ow->buffer))
set_marker_both (ow->pointm, ow->buffer,
BUF_PT (XBUFFER (ow->buffer)),
BUF_PT_BYTE (XBUFFER (ow->buffer)));
selected_window = window;
if (XFRAME (WINDOW_FRAME (w)) != selected_frame)
......@@ -3275,6 +3276,15 @@ by `current-window-configuration' (which see).")
x_set_menu_bar_lines (f, data->frame_menu_bar_lines, 0);
#endif
if (! NILP (XWINDOW (selected_window)->buffer))
{
w = XWINDOW (selected_window);
set_marker_both (w->pointm,
w->buffer,
BUF_PT (XBUFFER (w->buffer)),
BUF_PT_BYTE (XBUFFER (w->buffer)));
}
windows_or_buffers_changed++;
FRAME_WINDOW_SIZES_CHANGED (f) = 1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment