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

[Luc Teirlinck]

Index: emacs/src/frame.c
diff -c emacs/src/frame.c:1.315 emacs/src/frame.c:1.316
*** emacs/src/frame.c:1.315     Sun Apr 24 06:03:58 2005
--- emacs/src/frame.c   Fri Jun 10 02:22:11 2005
***************
*** 729,735 ****
    return frame;
  }
  
! DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e",
         doc: /* Select the frame FRAME.
  Subsequent editing commands apply to its selected window.
  The selection of FRAME lasts until the next time the user does
--- 729,735 ----
    return frame;
  }
  
! DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 1, "e",
         doc: /* Select the frame FRAME.
  Subsequent editing commands apply to its selected window.
  The selection of FRAME lasts until the next time the user does
***************
*** 740,753 ****
  focus.  On a text-only terminal, the next redisplay will display FRAME.
  
  This function returns FRAME, or nil if FRAME has been deleted.  */)
!   (frame, no_enter)
!     Lisp_Object frame, no_enter;
  {
    return do_switch_frame (frame, 1, 0);
  }
  
  
! DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 
2, "e",
         doc: /* Handle a switch-frame event EVENT.
  Switch-frame events are usually bound to this function.
  A switch-frame event tells Emacs that the window manager has requested
--- 740,753 ----
  focus.  On a text-only terminal, the next redisplay will display FRAME.
  
  This function returns FRAME, or nil if FRAME has been deleted.  */)
!   (frame)
!     Lisp_Object frame;
  {
    return do_switch_frame (frame, 1, 0);
  }
  
  
! DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 
1, "e",
         doc: /* Handle a switch-frame event EVENT.
  Switch-frame events are usually bound to this function.
  A switch-frame event tells Emacs that the window manager has requested
***************
*** 756,763 ****
  
  If EVENT is frame object, handle it as if it were a switch-frame event
  to that frame.  */)
!      (event, no_enter)
!      Lisp_Object event, no_enter;
  {
    /* Preserve prefix arg that the command loop just cleared.  */
    current_kboard->Vprefix_arg = Vcurrent_prefix_arg;
--- 756,763 ----
  
  If EVENT is frame object, handle it as if it were a switch-frame event
  to that frame.  */)
!      (event)
!      Lisp_Object event;
  {
    /* Preserve prefix arg that the command loop just cleared.  */
    current_kboard->Vprefix_arg = Vcurrent_prefix_arg;
***************
*** 1530,1536 ****
  #if defined (MSDOS) && defined (HAVE_MOUSE)
    if (FRAME_MSDOS_P (XFRAME (frame)))
      {
!       Fselect_frame (frame, Qnil);
        mouse_moveto (XINT (x), XINT (y));
      }
  #endif
--- 1530,1536 ----
  #if defined (MSDOS) && defined (HAVE_MOUSE)
    if (FRAME_MSDOS_P (XFRAME (frame)))
      {
!       Fselect_frame (frame);
        mouse_moveto (XINT (x), XINT (y));
      }
  #endif
***************
*** 1562,1568 ****
  #if defined (MSDOS) && defined (HAVE_MOUSE)
    if (FRAME_MSDOS_P (XFRAME (frame)))
      {
!       Fselect_frame (frame, Qnil);
        mouse_moveto (XINT (x), XINT (y));
      }
  #endif
--- 1562,1568 ----
  #if defined (MSDOS) && defined (HAVE_MOUSE)
    if (FRAME_MSDOS_P (XFRAME (frame)))
      {
!       Fselect_frame (frame);
        mouse_moveto (XINT (x), XINT (y));
      }
  #endif
***************
*** 1684,1690 ****
  #if 0 /* This isn't logically necessary, and it can do GC.  */
    /* Don't let the frame remain selected.  */
    if (EQ (frame, selected_frame))
!     Fhandle_switch_frame (next_frame (frame, Qt), Qnil);
  #endif
  
    /* Don't allow minibuf_window to remain on a deleted frame.  */
--- 1684,1690 ----
  #if 0 /* This isn't logically necessary, and it can do GC.  */
    /* Don't let the frame remain selected.  */
    if (EQ (frame, selected_frame))
!     Fhandle_switch_frame (next_frame (frame, Qt));
  #endif
  
    /* Don't allow minibuf_window to remain on a deleted frame.  */