In display-time-world restore fit-window-to-buffer behavior.

[gnu-emacs] / lisp / window.el

diff --git a/lisp/window.el b/lisp/window.el
index fa7b08375ce0899a85824d5043b07440cadc1fee..bd043390d90d68f5e3b99b3f20fdf6c06437e1d2 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5414,6 +5414,22 @@ Recognized alist entries include:
                               parameters to give a new frame, if
                               one is created.
 
+ `window-height' -- Value specifies either an integer (the number
+    of lines of a new window), a floating point number (the
+    fraction of a new window with respect to the height of the
+    frame's root window) or a function to be called with one
+    argument - a new window.  The function is supposed to adjust
+    the height of the window; its return value is ignored.
+    Suitable functions are `shrink-window-if-larger-than-buffer'
+    and `fit-window-to-buffer'.
+
+ `window-width' -- Value specifies either an integer (the number
+    of columns of a new window), a floating point number (the
+    fraction of a new window with respect to the width of the
+    frame's root window) or a function to be called with one
+    argument - a new window.  The function is supposed to adjust
+    the width of the window; its return value is ignored.
+
 The ACTION argument to `display-buffer' can also have a non-nil
 and non-list value.  This means to display the buffer in a window
 other than the selected one, even if it is already displayed in