mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-18 10:16:51 +00:00
(Fselect_window): Don't set OW->pointm if OW->buffer is nil.
(Fset_window_configuration): Set old selected window's pointm.
This commit is contained in:
parent
4101e6fea4
commit
596ae0cfb6
16
src/window.c
16
src/window.c
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user