From: Miles Bader <miles@gnu.org>
Date: Sun, 22 Oct 2000 04:18:14 +0000 (+0000)
Subject: (window-text-height): Don't expect minibuffers to have mode-lines.
X-Git-Tag: emacs-pretest-21.0.90~692
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=582b0985f51d7ed2d26852b0cc64a598d3680ef0;p=emacs.git

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

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