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

1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/window.el b/lisp/window.el
index ab1b52b43fa..4b0d3b5334f 100644
--- 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