# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 973704957 0
# Node ID 1e1d6d07728837fbbaf361820abfc52b502186da
# Parent  fa5c3f22519c7e6b4e2c75eea9528fd2b7fe8a88
(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.

diff -r fa5c3f22519c -r 1e1d6d077288 lisp/simple.el
--- a/lisp/simple.el	Wed Nov 08 17:32:46 2000 +0000
+++ b/lisp/simple.el	Wed Nov 08 17:35:57 2000 +0000
@@ -1112,14 +1112,14 @@
 The output appears in the buffer `*Async Shell Command*'.
 That buffer is in shell mode.
 
-Otherwise, COMMAND is executed synchronously.  The output appears in the
-buffer `*Shell Command Output*'.  If the output is short enough to
-display in the echo area (which is determined by the variable
-`max-mini-window-height'), it is shown there, but it is nonetheless
-available in buffer `*Shell Command Output*' even though that buffer is
-not automatically displayed.  If there is no output, or if output is
-inserted in the current buffer, then `*Shell Command Output*' is
-deleted.
+Otherwise, COMMAND is executed synchronously.  The output appears in
+the buffer `*Shell Command Output*'.  If the output is short enough to
+display in the echo area (which is determined by the variables
+`resize-mini-windows' and `max-mini-window-height'), it is shown
+there, but it is nonetheless available in buffer `*Shell Command
+Output*' even though that buffer is not automatically displayed.  If
+there is no output, or if output is inserted in the current buffer,
+then `*Shell Command Output*' is deleted.
 
 To specify a coding system for converting non-ASCII characters
 in the shell command output, use \\[universal-coding-system-argument]
@@ -1230,7 +1230,8 @@
 MESSAGE may be either a string or a buffer.
 
 A buffer is displayed using `display-buffer' if MESSAGE is too long for
-the maximum height of the echo area, as defined by `max-mini-window-height'.
+the maximum height of the echo area, as defined by `max-mini-window-height'
+if `resize-mini-windows' is non-nil.
 
 Returns either the string shown in the echo area, or when a pop-up
 buffer is used, the window used to display it.
@@ -1267,12 +1268,15 @@
 		    (count-lines (point-min) (point-max)))))
 	     (cond ((or (<= lines 1)
 			(<= lines
-			    (cond ((floatp max-mini-window-height)
-				   (* (frame-height) max-mini-window-height))
-				  ((integerp max-mini-window-height)
-				   max-mini-window-height)
-				  (t
-				   1))))
+			    (if resize-mini-windows
+				(cond ((floatp max-mini-window-height)
+				       (* (frame-height)
+					  max-mini-window-height))
+				      ((integerp max-mini-window-height)
+				       max-mini-window-height)
+				      (t
+				       1))
+			      1)))
 		    ;; Echo area
 		    (goto-char (point-max))
 		    (when (bolp)
@@ -1313,11 +1317,12 @@
 `coding-system-for-write'.
 
 If the output is short enough to display in the echo area (which is
-determined by the variable `max-mini-window-height'), it is shown there,
-but it is nonetheless available in buffer `*Shell Command Output*' even
-though that buffer is not automatically displayed.  If there is no
-output, or if output is inserted in the current buffer, then `*Shell
-Command Output*' is deleted.
+determined by the variable `max-mini-window-height' if
+`resize-mini-windows' is non-nil), it is shown there, but it is
+nonetheless available in buffer `*Shell Command Output*' even though
+that buffer is not automatically displayed.  If there is no output, or
+if output is inserted in the current buffer, then `*Shell Command
+Output*' is deleted.
 
 If the optional fourth argument OUTPUT-BUFFER is non-nil,
 that says to put the output in some other buffer.