(window-text-height): Don't expect minibuffers to have mode-lines.

diff --git a/lisp/window.el b/lisp/window.el
index ab1b52b43faf790c69728cbebf76e4d7c177ffe7..4b0d3b5334f5b77bd044f90c1651c435af93d109 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -338,7 +338,8 @@ returning fewer lines than actually exist in the case where the real
 value cannot be determined."
   (with-current-buffer (window-buffer window)
     (- (window-height window)
-       (if mode-line-format
+       (if (and (not (window-minibuffer-p window))
+               mode-line-format)
           (1+ (mode-line-window-height-fudge))
         0)
        (if header-line-format