[Emacs-diffs] Changes to emacs/src/window.c

[Richard M. Stallman]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.427 emacs/src/window.c:1.428
*** emacs/src/window.c:1.427    Wed Sep  4 22:36:22 2002
--- emacs/src/window.c  Sat Sep 21 14:37:10 2002
***************
*** 2759,2764 ****
--- 2759,2767 ----
  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,2814 ****
  
    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
      sf->selected_window = window;
  
    if (recordflag)
--- 2802,2808 ----
  
    selected_window = window;
    sf = SELECTED_FRAME ();
!   if (XFRAME (WINDOW_FRAME (w)) == sf)
      sf->selected_window = window;
  
    if (recordflag)