# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 973705282 0
# Node ID d1bd6bb27342068e48c5c2fde12b5b4388324875
# Parent  d09fc097a22d654dffda1f31f720d83d7d0f7cc3
*** empty log message ***

diff -r d09fc097a22d -r d1bd6bb27342 etc/NEWS
--- a/etc/NEWS	Wed Nov 08 17:40:50 2000 +0000
+++ b/etc/NEWS	Wed Nov 08 17:41:22 2000 +0000
@@ -2675,6 +2675,7 @@
 * 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 -r d09fc097a22d -r d1bd6bb27342 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Nov 08 17:40:50 2000 +0000
+++ b/lisp/ChangeLog	Wed Nov 08 17:41:22 2000 +0000
@@ -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 -r d09fc097a22d -r d1bd6bb27342 man/ChangeLog
--- a/man/ChangeLog	Wed Nov 08 17:40:50 2000 +0000
+++ b/man/ChangeLog	Wed Nov 08 17:41:22 2000 +0000
@@ -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 -r d09fc097a22d -r d1bd6bb27342 src/ChangeLog
--- a/src/ChangeLog	Wed Nov 08 17:40:50 2000 +0000
+++ b/src/ChangeLog	Wed Nov 08 17:41:22 2000 +0000
@@ -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.