From 989d0afce9701fb3409f5d53f0e47460be709e0e Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 9 Feb 2018 12:28:59 +0200
Subject: [PATCH] Improve documentation of mini-window resizing

* doc/lispref/minibuf.texi (Minibuffer Windows): Mention
'message-truncate-lines' for preventing resizing of minibuffer
windows.  (Bug#19045)
(Minibuffer Misc): Remove redundant description of
'max-mini-window-height'.
* doc/lispref/display.texi (Echo Area Customization): Adjust
cross-reference.
---
 doc/lispref/display.texi |  2 +-
 doc/lispref/minibuf.texi | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index fbf943a08c7..7bf03b8558e 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -581,7 +581,7 @@ truncated to fit it.
   The variable @code{max-mini-window-height}, which specifies the
 maximum height for resizing minibuffer windows, also applies to the
 echo area (which is really a special use of the minibuffer window;
-@pxref{Minibuffer Misc}).
+@pxref{Minibuffer Windows}).
 
 @node Warnings
 @section Reporting Warnings
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 332e72f6402..c7f8ba96e2f 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -2323,6 +2323,12 @@ frame's height; an integer specifies the maximum number of lines.  The
 default value is 0.25.
 @end defopt
 
+Note that the values of the above two variables take effect at display
+time, so let-binding them around code which produces echo-area messages
+will not work.  If you want to prevent resizing of minibuffer windows
+when displaying long messages, bind the @code{message-truncate-lines}
+variable instead (@pxref{Echo Area Customization}).
+
 
 @node Minibuffer Contents
 @section Minibuffer Contents
@@ -2450,12 +2456,6 @@ minibuffer window was selected.  If the selected window is not a
 minibuffer window, it returns @code{nil}.
 @end defun
 
-@defopt max-mini-window-height
-This variable specifies the maximum height for resizing minibuffer
-windows.  If a float, it specifies a fraction of the height of the
-frame.  If an integer, it specifies a number of lines.
-@end defopt
-
 @vindex minibuffer-message-timeout
 @defun minibuffer-message string &rest args
 This function displays @var{string} temporarily at the end of the
-- 
2.11.4.GIT