Mercurial > emacs
changeset 47567:1075de6f6ebd
(select_window_1): Don't select frame.
Set frame's selected window only when frame itself is selected.
(Fselect_window): Doc fix.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 21 Sep 2002 18:37:10 +0000 |
| parents | 65c4cd99d916 |
| children | 731d8ffd0589 |
| files | src/window.c |
| diffstat | 1 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Fri Sep 20 23:51:44 2002 +0000 +++ b/src/window.c Sat Sep 21 18:37:10 2002 +0000 @@ -2759,6 +2759,9 @@ DEFUN ("select-window", Fselect_window, Sselect_window, 1, 1, 0, doc: /* Select WINDOW. Most editing will apply to WINDOW's buffer. If WINDOW is not already selected, also make WINDOW's buffer current. +If WINDOW's frame is the selected frame, also make WINDOW the frame's +selected window. + Note that the main editor command loop selects the buffer of the selected window before each command. */) (window) @@ -2799,16 +2802,7 @@ selected_window = window; sf = SELECTED_FRAME (); - if (XFRAME (WINDOW_FRAME (w)) != sf) - { - XFRAME (WINDOW_FRAME (w))->selected_window = window; - /* Use this rather than Fhandle_switch_frame - so that FRAME_FOCUS_FRAME is moved appropriately as we - move around in the state where a minibuffer in a separate - frame is active. */ - Fselect_frame (WINDOW_FRAME (w), Qnil); - } - else + if (XFRAME (WINDOW_FRAME (w)) == sf) sf->selected_window = window; if (recordflag)