Mercurial > emacs

comparison src/window.c @ 20627:0753fa7a67f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fselect_window): Don't set OW->pointm if OW->buffer is nil. (Fset_window_configuration): Set old selected window's pointm.
author Richard M. Stallman <rms@gnu.org>
date Fri, 09 Jan 1998 23:18:35 +0000
parents 3094e3fd9764
children 19ba67f153d5
comparison
equal deleted inserted replaced
20626:a39bcf9c0e1e 20627:0753fa7a67f3
1961 1961
1962 XSETFASTINT (w->use_time, ++window_select_count); 1962 XSETFASTINT (w->use_time, ++window_select_count);
1963 if (EQ (window, selected_window)) 1963 if (EQ (window, selected_window))
1964 return window; 1964 return window;
1965 1965
1966 set_marker_both (ow->pointm, ow->buffer, 1966 if (! NILP (ow->buffer))
1967 BUF_PT (XBUFFER (ow->buffer)), 1967 set_marker_both (ow->pointm, ow->buffer,
1968 BUF_PT_BYTE (XBUFFER (ow->buffer))); 1968 BUF_PT (XBUFFER (ow->buffer)),
1969 BUF_PT_BYTE (XBUFFER (ow->buffer)));
1969 1970
1970 selected_window = window; 1971 selected_window = window;
1971 if (XFRAME (WINDOW_FRAME (w)) != selected_frame) 1972 if (XFRAME (WINDOW_FRAME (w)) != selected_frame)
1972 { 1973 {
1973 XFRAME (WINDOW_FRAME (w))->selected_window = window; 1974 XFRAME (WINDOW_FRAME (w))->selected_window = window;
3272 #if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS) 3273 #if defined (HAVE_WINDOW_SYSTEM) || defined (MSDOS)
3273 if (XFASTINT (data->frame_menu_bar_lines) 3274 if (XFASTINT (data->frame_menu_bar_lines)
3274 != previous_frame_menu_bar_lines) 3275 != previous_frame_menu_bar_lines)
3275 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, 0); 3276 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, 0);
3276 #endif 3277 #endif
3278
3279 if (! NILP (XWINDOW (selected_window)->buffer))
3280 {
3281 w = XWINDOW (selected_window);
3282 set_marker_both (w->pointm,
3283 w->buffer,
3284 BUF_PT (XBUFFER (w->buffer)),
3285 BUF_PT_BYTE (XBUFFER (w->buffer)));
3286 }
3277 3287
3278 windows_or_buffers_changed++; 3288 windows_or_buffers_changed++;
3279 FRAME_WINDOW_SIZES_CHANGED (f) = 1; 3289 FRAME_WINDOW_SIZES_CHANGED (f) = 1;
3280 3290
3281 /* Temporarily avoid any problems with windows that are smaller 3291 /* Temporarily avoid any problems with windows that are smaller