Bump version to 23.0.91.

[gnu-emacs] / doc / lispref / windows.texi

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 83875902ce04e8a7eb7df308bfa78a04adc8626b..f743774ab45e6e8c5ed2025dcfd5a117ac193956 100644 (file)
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
-@c   2002, 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/windows
 @node Windows, Frames, Buffers, Top
@@ -957,11 +957,11 @@ window.  If the buffer is not already displayed, or
 @defopt pop-up-windows
 This variable specifies whether @code{display-buffer} is allowed to
 split (@pxref{Splitting Windows}) an existing window .  If it is
-non-@code{nil}, @code{display-buffer} tries to the split the largest or
-least recently used window on the selected frame.  (If the selected
-frame is a minibuffer-only frame, it tries to split a window on another
-frame instead.)  If @code{pop-up-windows} is nil or the variable
-@code{pop-up-frames} (see below) is non-@code{nil},
+non-@code{nil}, @code{display-buffer} tries to the split the largest
+or least recently used window on the selected frame.  (If the selected
+frame is a minibuffer-only frame, it tries to split a window on
+another frame instead.)  If @code{pop-up-windows} is @code{nil} or the
+variable @code{pop-up-frames} (see below) is non-@code{nil},
 @code{display-buffer} does not split any window.
 @end defopt
 
@@ -1053,9 +1053,9 @@ variable is a function that creates a frame using parameters from
 @end defopt
 
 @defopt pop-up-frame-alist
-This variable holds an alist specifying frame parameters used when
-@code{display-buffer} makes a new frame.  @xref{Frame Parameters}, for
-more information about frame parameters.
+This variable holds an alist specifying frame parameters used by the
+default value of @code{pop-up-frame-function} for making new frames.
+@xref{Frame Parameters}, for more information about frame parameters.
 @end defopt
 
 @defopt special-display-buffer-names
@@ -2167,14 +2167,18 @@ function returns @code{nil}.
 
 @defun fit-window-to-buffer &optional window max-height min-height
 This function makes @var{window} the right height to display its
-contents exactly.  The default for @var{window} is 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.
+contents exactly.  The default for @var{window} is the selected window.
+
+The optional argument @var{max-height} specifies the maximum height the
+window is allowed to be; @code{nil} means use the maximum permissible
+height of a window on @var{window}'s frame.  The optional 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.
+
+This function can delete windows when their height shrinks below
+@var{min-height}.  It returns non-@code{nil} if it orderly resized
+@var{window}, and @code{nil} otherwise.
 @end defun
 
 @deffn Command shrink-window-if-larger-than-buffer &optional window