(set-window-text-height): Only set window-min-height to

1 if that's the requested size.

diff --git a/lisp/window.el b/lisp/window.el
index ef9dd5d896d7ec322c1b1d84a1902f1c3c0181cb..2ae1a2c9e795a8ad4e54ccdf67e339f1968fc5d4 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -532,7 +532,11 @@ the height exactly, but attempts to be conservative, by allocating more
 lines than are actually needed in the case where some error may be present."
   (let ((delta (- height (window-text-height window))))
     (unless (zerop delta)
-      (let ((window-min-height 1))
+      ;; Setting window-min-height to a value like 1 can lead to very
+      ;; bizarre displays because it also allows Emacs to make *other*
+      ;; windows 1-line tall, which means that there's no more space for
+      ;; the modeline.
+      (let ((window-min-height (min 2 height))) ;One text line plus a modeline.
        (if (and window (not (eq window (selected-window))))
            (save-selected-window
              (select-window window)