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

[Miles Bader]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.417.2.13 emacs/src/window.c:1.417.2.14
*** emacs/src/window.c:1.417.2.13       Tue Jul  6 10:17:21 2004
--- emacs/src/window.c  Sat Jul 17 02:49:50 2004
***************
*** 393,399 ****
  }
  
  DEFUN ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0,
!        doc: /* Return the buffer that WINDOW is displaying.  */)
       (window)
       Lisp_Object window;
  {
--- 393,400 ----
  }
  
  DEFUN ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0,
!        doc: /* Return the buffer that WINDOW is displaying.
! WINDOW defaults to the selected window.  */)
       (window)
       Lisp_Object window;
  {
***************
*** 1747,1754 ****
         doc: /* Select the ARG'th different window on this frame.
  All windows on current frame are arranged in a cyclic order.
  This command selects the window ARG steps away in that order.
! A negative ARG moves in the opposite order.  If the optional second
! argument ALL_FRAMES is non-nil, cycle through all frames.  */)
       (arg, all_frames)
       Lisp_Object arg, all_frames;
  {
--- 1748,1755 ----
         doc: /* Select the ARG'th different window on this frame.
  All windows on current frame are arranged in a cyclic order.
  This command selects the window ARG steps away in that order.
! A negative ARG moves in the opposite order.  The optional second
! argument ALL_FRAMES has the same meaning as in `next-window', which see.  */)
       (arg, all_frames)
       Lisp_Object arg, all_frames;
  {
***************
*** 2066,2071 ****
--- 2067,2073 ----
  DEFUN ("get-lru-window", Fget_lru_window, Sget_lru_window, 0, 1, 0,
         doc: /* Return the window least recently selected or used for display.
  Return a full-width window if possible.
+ A minibuffer window is never a candidate.
  If optional argument FRAME is `visible', search all visible frames.
  If FRAME is 0, search all visible and iconified frames.
  If FRAME is t, search all frames.
***************
*** 2085,2090 ****
--- 2087,2093 ----
  
  DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_window, 0, 1, 
0,
         doc: /* Return the largest window in area.
+ A minibuffer window is never a candidate.
  If optional argument FRAME is `visible', search all visible frames.
  If FRAME is 0, search all visible and iconified frames.
  If FRAME is t, search all frames.
***************
*** 2099,2104 ****
--- 2102,2108 ----
  
  DEFUN ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 1, 2, 0,
         doc: /* Return a window currently displaying BUFFER, or nil if none.
+ BUFFER can be a buffer or a buffer name.
  If optional argument FRAME is `visible', search all visible frames.
  If optional argument FRAME is 0, search all visible and iconified frames.
  If FRAME is t, search all frames.
***************
*** 2181,2186 ****
--- 2185,2191 ----
  DEFUN ("delete-windows-on", Fdelete_windows_on, Sdelete_windows_on,
         1, 2, "bDelete windows on (buffer): ",
         doc: /* Delete all windows showing BUFFER.
+ BUFFER must be a buffer or the name of an existing buffer.
  Optional second argument FRAME controls which frames are affected.
  If optional argument FRAME is `visible', search all visible frames.
  If FRAME is 0, search all visible and iconified frames.
***************
*** 2210,2216 ****
  DEFUN ("replace-buffer-in-windows", Freplace_buffer_in_windows,
         Sreplace_buffer_in_windows,
         1, 1, "bReplace buffer in windows: ",
!        doc: /* Replace BUFFER with some other buffer in all windows showing 
it.  */)
       (buffer)
       Lisp_Object buffer;
  {
--- 2215,2222 ----
  DEFUN ("replace-buffer-in-windows", Freplace_buffer_in_windows,
         Sreplace_buffer_in_windows,
         1, 1, "bReplace buffer in windows: ",
!        doc: /* Replace BUFFER with some other buffer in all windows showing 
it.
! BUFFER may be a buffer or the name of an existing buffer.  */)
       (buffer)
       Lisp_Object buffer;
  {
***************
*** 3022,3028 ****
  
  DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0,
         doc: /* Make WINDOW display BUFFER as its contents.
! BUFFER can be a buffer or buffer name.
  Optional third arg KEEP-MARGINS non-nil means that WINDOW's current
  display margins, fringe widths, and scroll bar settings are maintained;
  the default is to reset these from BUFFER's local settings or the frame
--- 3028,3034 ----
  
  DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0,
         doc: /* Make WINDOW display BUFFER as its contents.
! BUFFER can be a buffer or the name of an existing buffer.
  Optional third arg KEEP-MARGINS non-nil means that WINDOW's current
  display margins, fringe widths, and scroll bar settings are maintained;
  the default is to reset these from BUFFER's local settings or the frame
***************
*** 3063,3069 ****
  DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
         doc: /* Select WINDOW.  Most editing will apply to WINDOW's buffer.
  If WINDOW is not already selected, make WINDOW's buffer current
! and make WINDOW the frame's selected window.
  Optional second arg NORECORD non-nil means
  do not put this buffer at the front of the list of recently selected ones.
  
--- 3069,3075 ----
  DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
         doc: /* Select WINDOW.  Most editing will apply to WINDOW's buffer.
  If WINDOW is not already selected, make WINDOW's buffer current
! and make WINDOW the frame's selected window.  Return WINDOW.
  Optional second arg NORECORD non-nil means
  do not put this buffer at the front of the list of recently selected ones.
  
***************
*** 3247,3253 ****
  DEFUN ("display-buffer", Fdisplay_buffer, Sdisplay_buffer, 1, 3,
         "BDisplay buffer: \nP",
         doc: /* Make BUFFER appear in some window but don't select it.
! BUFFER can be a buffer or a buffer name.
  If BUFFER is shown already in some window, just use that one,
  unless the window is the selected window and the optional second
  argument NOT-THIS-WINDOW is non-nil (interactively, with prefix arg).
--- 3253,3260 ----
  DEFUN ("display-buffer", Fdisplay_buffer, Sdisplay_buffer, 1, 3,
         "BDisplay buffer: \nP",
         doc: /* Make BUFFER appear in some window but don't select it.
! BUFFER must  be the name of an existing buffer, or, when called from Lisp,
! a buffer.
  If BUFFER is shown already in some window, just use that one,
  unless the window is the selected window and the optional second
  argument NOT-THIS-WINDOW is non-nil (interactively, with prefix arg).
***************
*** 3590,3596 ****
  If optional third arg HORFLAG is non-nil, split side by side
  and put SIZE columns in the first of the pair.  In that case,
  SIZE includes that window's scroll bar, or the divider column to its right.
! Returns the newly-created window.  */)
       (window, size, horflag)
       Lisp_Object window, size, horflag;
  {
--- 3597,3607 ----
  If optional third arg HORFLAG is non-nil, split side by side
  and put SIZE columns in the first of the pair.  In that case,
  SIZE includes that window's scroll bar, or the divider column to its right.
! Interactively, all arguments are nil.
! 
! Returns the newly created window (which is the lower or rightmost one).
! The upper or leftmost window is the original one and remains selected.
! See Info node `(elisp)Splitting Windows' for more details and examples.*/)
       (window, size, horflag)
       Lisp_Object window, size, horflag;
  {
***************
*** 6455,6461 ****
    DEFVAR_LISP ("display-buffer-function", &Vdisplay_buffer_function,
               doc: /* If non-nil, function to call to handle `display-buffer'.
  It will receive two args, the buffer and a flag which if non-nil means
!  that the currently selected window is not acceptable.
  Commands such as `switch-to-buffer-other-window' and `find-file-other-window'
  work using this function.  */);
    Vdisplay_buffer_function = Qnil;
--- 6466,6474 ----
    DEFVAR_LISP ("display-buffer-function", &Vdisplay_buffer_function,
               doc: /* If non-nil, function to call to handle `display-buffer'.
  It will receive two args, the buffer and a flag which if non-nil means
! that the currently selected window is not acceptable.
! It should choose or create a window, display the specified buffer in it,
! and return the window.
  Commands such as `switch-to-buffer-other-window' and `find-file-other-window'
  work using this function.  */);
    Vdisplay_buffer_function = Qnil;