[Emacs-diffs] Changes to emacs/lispref/windows.texi

[Richard M . Stallman]

Index: emacs/lispref/windows.texi
diff -c emacs/lispref/windows.texi:1.78 emacs/lispref/windows.texi:1.79
*** emacs/lispref/windows.texi:1.78     Sun Jan 23 13:30:22 2005
--- emacs/lispref/windows.texi  Thu Feb  3 07:19:07 2005
***************
*** 53,63 ****
  
    In each frame, at any time, one and only one window is designated as
  @dfn{selected within the frame}.  The frame's cursor appears in that
! window.  At any time, one frame is the selected frame; and the window
! selected within that frame is @dfn{the selected window}.  The selected
! window's buffer is usually the current buffer (except when
  @code{set-buffer} has been used).  @xref{Current Buffer}.
  
    For practical purposes, a window exists only while it is displayed in
  a frame.  Once removed from the frame, the window is effectively deleted
  and should not be used, @emph{even though there may still be references
--- 53,69 ----
  
    In each frame, at any time, one and only one window is designated as
  @dfn{selected within the frame}.  The frame's cursor appears in that
! window, but the other windows have ``non-selected'' cursors, normally
! less visible.  At any time, one frame is the selected frame; and the
! window selected within that frame is @dfn{the selected window}.  The
! selected window's buffer is usually the current buffer (except when
  @code{set-buffer} has been used).  @xref{Current Buffer}.
  
+ @defvar cursor-in-non-selected-windows
+ If this variable is @code{nil}, Emacs displays only one cursor,
+ in the selected window.  Other windows have no cursor at all.
+ @end defvar
+ 
    For practical purposes, a window exists only while it is displayed in
  a frame.  Once removed from the frame, the window is effectively deleted
  and should not be used, @emph{even though there may still be references
***************
*** 455,464 ****
  @end defun
  
  @defmac save-selected-window address@hidden
! This macro records the selected window, as well as the selected window
  of each frame, executes @var{forms} in sequence, then restores the
! earlier selected windows.  It returns the value of the last form in
! @var{forms}.
  
  This macro does not save or restore anything about the sizes,
  arrangement or contents of windows; therefore, if the @var{forms}
--- 461,470 ----
  @end defun
  
  @defmac save-selected-window address@hidden
! This macro records the selected frame, as well as the selected window
  of each frame, executes @var{forms} in sequence, then restores the
! earlier selected frame and windows It returns the value of the last
! form in @var{forms}.
  
  This macro does not save or restore anything about the sizes,
  arrangement or contents of windows; therefore, if the @var{forms}
***************
*** 648,655 ****
  
  @c Emacs 19 feature
  @defun walk-windows proc &optional minibuf all-frames
! This function cycles through all windows, calling @code{proc}
! once for each window with the window as its sole argument.
  
  The optional arguments @var{minibuf} and @var{all-frames} specify the
  set of windows to include in the scan.  See @code{next-window}, above,
--- 654,662 ----
  
  @c Emacs 19 feature
  @defun walk-windows proc &optional minibuf all-frames
! This function cycles through all windows.  It calls the function
! @code{proc} once for each window, with the window as its sole
! argument.
  
  The optional arguments @var{minibuf} and @var{all-frames} specify the
  set of windows to include in the scan.  See @code{next-window}, above,
***************
*** 1175,1184 ****
  @item
  As long as the selected window displays the current buffer, the window's
  point and the buffer's point always move together; they remain equal.
  
! @item
  @xref{Positions}, for more details on buffer positions.
- @end itemize
  
    As far as the user is concerned, point is where the cursor is, and
  when the user switches to another buffer, the cursor jumps to the
--- 1182,1191 ----
  @item
  As long as the selected window displays the current buffer, the window's
  point and the buffer's point always move together; they remain equal.
+ @end itemize
  
! @noindent
  @xref{Positions}, for more details on buffer positions.
  
    As far as the user is concerned, point is where the cursor is, and
  when the user switches to another buffer, the cursor jumps to the
***************
*** 1356,1361 ****
--- 1363,1369 ----
  
  @example
  @group
+ ;; @r{If point is off the screen now, recenter it now.}
  (or (pos-visible-in-window-p
       (point) (selected-window))
      (recenter 0))
***************
*** 1984,1989 ****
--- 1992,1998 ----
  @example
  @group
  (defun enlarge-window-horizontally (columns)
+   (interactive "p")
    (enlarge-window columns t))
  @end group
  @end example
***************
*** 2006,2021 ****
  @example
  @group
  (defun shrink-window-horizontally (columns)
    (shrink-window columns t))
  @end group
  @end example
  @end deffn
  
  @deffn Command shrink-window-if-larger-than-buffer &optional window
! This command shrinks @var{window} to be as small as possible while still
! showing the full contents of its buffer---but not less than
! @code{window-min-height} lines.  If @var{window} is not given,
! it defaults to the selected window.
  
  However, the command does nothing if the window is already too small to
  display the whole text of the buffer, or if part of the contents are
--- 2015,2043 ----
  @example
  @group
  (defun shrink-window-horizontally (columns)
+   (interactive "p")
    (shrink-window columns t))
  @end group
  @end example
  @end deffn
  
+ @defun fit-window-to-buffer &optional window max-height min-height
+ This function makes @var{window} the right height to display its
+ contents exactly.  If @var{window} is omitted or @code{nil}, it uses
+ the selected window.
+ 
+ The argument @var{max-height} specifies the maximum height the window
+ is allowed to be; @code{nil} means use the frame height.  The argument
+ @var{min-height} specifies the minimum height for the window;
+ @code{nil} means use @code{window-min-height}.  All these height
+ values include the mode-line and/or header-line.
+ @end defun
+ 
  @deffn Command shrink-window-if-larger-than-buffer &optional window
! This command shrinks @var{window} vertically to be as small as
! possible while still showing the full contents of its buffer---but not
! less than @code{window-min-height} lines.  If @var{window} is not
! given, it defaults to the selected window.
  
  However, the command does nothing if the window is already too small to
  display the whole text of the buffer, or if part of the contents are