# HG changeset patch # User Richard M. Stallman # Date 884387915 0 # Node ID 0753fa7a67f33ee3e72b6bd3118858a2cd89d318 # Parent a39bcf9c0e1e9cf4bd9970dd3b1550d8ee5092b0 (Fselect_window): Don't set OW->pointm if OW->buffer is nil. (Fset_window_configuration): Set old selected window's pointm. diff -r a39bcf9c0e1e -r 0753fa7a67f3 src/window.c --- a/src/window.c Fri Jan 09 23:17:52 1998 +0000 +++ b/src/window.c Fri Jan 09 23:18:35 1998 +0000 @@ -1963,9 +1963,10 @@ 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 @@ 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;