Mercurial > emacs
comparison src/window.c @ 12288:36d3bd1212de
(Fset_window_configuration): Use do_switch_frame directly.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 16 Jun 1995 23:28:57 +0000 |
parents | 35b170692e4a |
children | caca393b084c |
comparison
equal
deleted
inserted
replaced
12287:7020a83cd08c | 12288:36d3bd1212de |
---|---|
3084 | 3084 |
3085 #if 0 /* I don't understand why this is needed, and it causes problems | 3085 #if 0 /* I don't understand why this is needed, and it causes problems |
3086 when the frame's old selected window has been deleted. */ | 3086 when the frame's old selected window has been deleted. */ |
3087 #ifdef MULTI_FRAME | 3087 #ifdef MULTI_FRAME |
3088 if (f != selected_frame && ! FRAME_TERMCAP_P (f)) | 3088 if (f != selected_frame && ! FRAME_TERMCAP_P (f)) |
3089 Fhandle_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)), Qnil); | 3089 do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)), |
3090 Qnil, 0); | |
3090 #endif | 3091 #endif |
3091 #endif | 3092 #endif |
3092 | 3093 |
3093 /* Set the screen height to the value it had before this function. */ | 3094 /* Set the screen height to the value it had before this function. */ |
3094 if (previous_frame_height != FRAME_HEIGHT (f) | 3095 if (previous_frame_height != FRAME_HEIGHT (f) |
3110 reselect the proper frame here. Fhandle_switch_frame will change the | 3111 reselect the proper frame here. Fhandle_switch_frame will change the |
3111 selected window too, but that doesn't make the call to | 3112 selected window too, but that doesn't make the call to |
3112 Fselect_window above totally superfluous; it still sets f's | 3113 Fselect_window above totally superfluous; it still sets f's |
3113 selected window. */ | 3114 selected window. */ |
3114 if (FRAME_LIVE_P (XFRAME (data->selected_frame))) | 3115 if (FRAME_LIVE_P (XFRAME (data->selected_frame))) |
3115 Fhandle_switch_frame (data->selected_frame, Qnil); | 3116 do_switch_frame (data->selected_frame, Qnil, 0); |
3116 #endif | 3117 #endif |
3117 | 3118 |
3118 if (!NILP (new_current_buffer)) | 3119 if (!NILP (new_current_buffer)) |
3119 Fset_buffer (new_current_buffer); | 3120 Fset_buffer (new_current_buffer); |
3120 | 3121 |