From 596ae0cfb6802162559fe179d0ae9a25952eb36a Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 9 Jan 1998 23:18:35 +0000 Subject: [PATCH] (Fselect_window): Don't set OW->pointm if OW->buffer is nil. (Fset_window_configuration): Set old selected window's pointm. --- src/window.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/window.c b/src/window.c index 59ca18fb66f..160c5dc00c5 100644 --- a/src/window.c +++ b/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; -- 2.39.2