(select_window_1): Don't select frame.

Set frame's selected window only when frame itself is selected.
(Fselect_window): Doc fix.

2 files changed, 10 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e0e1c2c56ce..eda5d664c12 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-21  Richard M. Stallman  <rms@gnu.org>
+
+        * window.c (select_window_1): Don't select frame.
+        Set frame's selected window only when frame itself is selected.
+        (Fselect_window): Doc fix.
+
 2002-09-18  Kim F. Storm  <storm@cua.dk>
 
         * process.c (make-network-process): Doc fix (there is no
diff --git a/src/window.c b/src/window.c
index c629a30cb7d..e7b1ba45373 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2759,6 +2759,9 @@ BUFFER can be a buffer or buffer name.  */)
 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 @@ select_window_1 (window, recordflag)
 
   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)