Mercurial > emacs
changeset 1572:04c1b4719e60
* window.c (Fset_window_configuration): Protect call to
Fselect_frame with a #ifdef MULTI_FRAME.
[not MULTI_FRAME] (Fcurrent_window_configuration): Don't bother
setting the window configuration's selected_frame member.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Sat, 07 Nov 1992 07:37:42 +0000 |
| parents | ca102ce0c00d |
| children | 884891e455cf |
| files | src/window.c |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Sat Nov 07 07:37:08 1992 +0000 +++ b/src/window.c Sat Nov 07 07:37:42 1992 +0000 @@ -2537,12 +2537,14 @@ FRAME_ROOT_WINDOW (f) = data->root_window; Fselect_window (data->current_window); +#ifdef MULTI_FRAME /* Fselect_window will have made f the selected frame, so we reselect the proper frame here. Fselect_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. */ Fselect_frame (data->selected_frame); +#endif if (!NILP (new_current_buffer)) Fset_buffer (new_current_buffer); @@ -2717,7 +2719,9 @@ Qnil)); XFASTINT (data->frame_width) = FRAME_WIDTH (f); XFASTINT (data->frame_height) = FRAME_HEIGHT (f); +#ifdef MULTI_FRAME XSET (data->selected_frame, Lisp_Frame, selected_frame); +#endif data->current_window = FRAME_SELECTED_WINDOW (f); XSET (data->current_buffer, Lisp_Buffer, current_buffer); data->minibuf_scroll_window = Vminibuf_scroll_window;