Mercurial > emacs
changeset 2297:bb88d48c290f
(Fselect_window): Use Fhandle_switch_frame.
(Fset_window_configuration): Likewise.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 21 Mar 1993 06:50:50 +0000 |
parents | 91fe00141e95 |
children | 872a3a2c3fed |
files | src/window.c |
diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Sun Mar 21 05:50:17 1993 +0000 +++ b/src/window.c Sun Mar 21 06:50:50 1993 +0000 @@ -1567,7 +1567,7 @@ if (XFRAME (WINDOW_FRAME (w)) != selected_frame) { XFRAME (WINDOW_FRAME (w))->selected_window = window; - Fselect_frame (WINDOW_FRAME (w), Qnil); + Fhandle_switch_frame (WINDOW_FRAME (w), Qnil); } else selected_frame->selected_window = window; @@ -1632,7 +1632,7 @@ = Fframe_selected_window (call0 (Vpop_up_frame_function)); Fset_window_buffer (window, buffer); #if 0 - Fselect_frame (XWINDOW (window)->frame, Qnil); + Fhandle_switch_frame (XWINDOW (window)->frame, Qnil); #endif return window; } @@ -2436,9 +2436,8 @@ } -DEFUN ("set-window-configuration", - Fset_window_configuration, Sset_window_configuration, - 1, 1, 0, +DEFUN ("set-window-configuration", Fset_window_configuration, + Sset_window_configuration, 1, 1, 0, "Set the configuration of windows and buffers as specified by CONFIGURATION.\n\ CONFIGURATION must be a value previously returned\n\ by `current-window-configuration' (which see).") @@ -2614,7 +2613,7 @@ when the frame's old selected window has been deleted. */ #ifdef MULTI_FRAME if (f != selected_frame && ! FRAME_TERMCAP_P (f)) - Fselect_frame (WINDOW_FRAME (XWINDOW (data->root_window)), Qnil); + Fhandle_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)), Qnil); #endif #endif @@ -2627,12 +2626,12 @@ #ifdef MULTI_FRAME /* Fselect_window will have made f the selected frame, so we - reselect the proper frame here. Fselect_frame will change the + reselect the proper frame here. Fhandle_switch_frame will change the selected window too, but that doesn't make the call to Fselect_window above totally superfluous; it still sets f's selected window. */ if (FRAME_LIVE_P (XFRAME (data->selected_frame))) - Fselect_frame (data->selected_frame, Qnil); + Fhandle_switch_frame (data->selected_frame, Qnil); #endif if (!NILP (new_current_buffer))