Make `resize-mini-windows' customizable and update documentation for it.

* cus-start.el (resize-mini-windows): Make it customizable.
* minibuf.texi (Minibuffer Windows): Add descriptions of
`resize-mini-windows' and `max-mini-window-height'.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b74719cd029db27a7ec15909e43d44cff41eccce..2d964cf650555bd5b2c4a364640dc8a439087d45 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -2,6 +2,9 @@
 
        * windows.texi (Windows): Resync @menu order with @node order.
 
+       * minibuf.texi (Minibuffer Windows): Add descriptions of
+       `resize-mini-windows' and `max-mini-window-height'.
+
 2014-12-25  Glenn Morris  <rgm@gnu.org>
 
        * windows.texi (Windows): Sync @menu order with @node order.

diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 1c6a74a89fddb8c9806d3a9d3a561e3913460907..57ae0e999b46d38b6bd144eaae98311002680641 100644 (file)
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -2218,8 +2218,8 @@ contents of the minibuffer before the point.
 @section Minibuffer Windows
 @cindex minibuffer windows
 
-  These functions access and select minibuffer windows
-and test whether they are active.
+These functions access and select minibuffer windows, test whether they
+are active and control how they get resized.
 
 @defun active-minibuffer-window
 This function returns the currently active minibuffer window, or
@@ -2260,6 +2260,29 @@ This function returns non-@code{nil} if @var{window} is the currently
 active minibuffer window.
 @end defun
 
+The following two options control whether minibuffer windows are resized
+automatically and how large they can get in the process.
+
+@defopt resize-mini-windows
+This option specifies whether minibuffer windows are resized
+automatically.  The default value is @code{grow-only}, which means that
+a minibuffer window by default expands automatically to accommodate the
+text it displays and shrinks back to one line as soon as the minibuffer
+gets empty.  If the value is @code{t}, Emacs will always try to fit the
+height of a minibuffer window to the text it displays (with a minimum of
+one line).  If the value is @code{nil}, a minibuffer window never
+changes size automatically.  In that case the window resizing commands
+(@pxref{Resizing Windows}) can be used to adjust its height.
+@end defopt
+
+@defopt max-mini-window-height
+This option provides a maximum height for resizing minibuffer windows
+automatically.  A floating-point number specifies a fraction of the
+frame's height; an integer specifies the maximum number of lines.  The
+default value is 0.25.
+@end defopt
+
+
 @node Minibuffer Contents
 @section Minibuffer Contents
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c369c7940f4085260452281728063aa892b2b6a7..6b0f2961d65f38abe077dd0eaa3d23eaff062cd5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-25  Martin Rudalics  <rudalics@gmx.at>
+
+       * cus-start.el (resize-mini-windows): Make it customizable.
+
 2014-12-24  Stephen Leake  <stephen_leake@stephe-leake.org>
 
        * startup.el (fancy-about-text): Change buttons for etc/CONTRIBUTE

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 4049974841e1c6ffe4ff5a6bcd79565a7fa6b86b..5394a1c3744167d772f4de0501b3b7aa5042e62e 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -520,7 +520,12 @@ since it could result in memory overflow and make Emacs crash."
                                      (const :tag "Hourglass" :value hourglass)))
             (display-hourglass cursor boolean)
             (hourglass-delay cursor number)
-
+            (resize-mini-windows
+             windows (choice
+                      (const :tag "Off (nil)" :value nil)
+                      (const :tag "Fit (t)" :value t)
+                      (const :tag "Grow only" :value grow-only))
+             "25.1")
             ;; xfaces.c
             (scalable-fonts-allowed display boolean "22.1")
             ;; xfns.c