4 files changed, 24 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 58e30392d12..62f46a2f48c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2675,6 +2675,7 @@ strings that have been consed so far.
 * Lisp-level Display features added after release 2.6 of the Emacs
 Lisp Manual
 
++++
 ** The user-option `resize-mini-windows' controls how Emacs resizes
 mini-windows.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34201247b2a..a0cbb53ab82 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-08  Gerd Moellmann  <gerd@gnu.org>
+
+        * simple.el (shell-command, display-message-or-buffer)
+        (shell-command-on-region): Mention resize-mini-windows in the doc
+        string.
+        (display-message-or-buffer): Take the value of resize-mini-windows
+        into account.
+
 2000-11-07  Gerd Moellmann  <gerd@gnu.org>
 
         * macros.el (insert-kbd-macro): Print semi-colons as `?\;'.
diff --git a/man/ChangeLog b/man/ChangeLog
index 7b283daab94..3f1c0cc4527 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-08  Gerd Moellmann  <gerd@gnu.org>
+
+        * mini.texi (Minibuffer Edit): Add description of
+        resize-mini-windows.
+
 2000-11-01  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * gnus.texi (Fancy Mail Splitting): Explain
diff --git a/src/ChangeLog b/src/ChangeLog
index 8aedd54b788..22dfe5b1008 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 2000-11-08  Gerd Moellmann  <gerd@gnu.org>
 
+        * xdisp.c (syms_of_xdisp): Change doc of max-mini-window-height.
+        (resize_mini_window): Return quickly if Vresize_mini_window is
+        nil.  Don't return if Vmax_mini_window_height is nil.
+
+        * xdisp.c (Vresize_mini_window, Qgrow_only): New variables.
+        (syms_of_xdisp): Initialize them.
+        (resize_mini_window): Act according to the setting of
+        Vresize_mini_window.
+        (syms_of_xdisp): Initialize Vmenu_bar_update_hook to nil.
+
         * xterm.c (x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]: Map the
         scroll bar widget after configuring it, so that it will appear at
         the right position from the start.