(resize-temp-buffer-window): Use `mode-line-window-height-fudge'.

2 files changed, 9 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a31de5e7d6f..9f2e71098e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2000-10-20  Miles Bader  <miles@lsi.nec.co.jp>
 
+        * window.el (mode-line-window-height-fudge): New variable.
+        (height-affecting-face-attributes): New variable.
+        (mode-line-window-height-fudge): New function.
+        (shrink-window-if-larger-than-buffer): Use it.
+        * help.el (resize-temp-buffer-window): Likewise.
+
         * info.el (Info-fontify-node): Add support for @subsubsection
         titles, which use `Info-title-4-face'.
         (Info-title-4-face): New face.
diff --git a/lisp/help.el b/lisp/help.el
index 2f84ce1cf1f..a607d81511b 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1466,15 +1466,12 @@ out of view."
     (let* ((max-height (if (functionp temp-buffer-max-height)
                            (funcall temp-buffer-max-height (current-buffer))
                          temp-buffer-max-height))
-           (win-height (1- (window-height)))
+           (win-height (- (window-height)
+                          (mode-line-window-height-fudge)
+                          1))
            (min-height (1- window-min-height))
            (text-height (count-screen-lines))
            (new-height (max (min text-height max-height) min-height)))
-      (when (display-graphic-p)
-        ;; This egregious hack is because mode-lines on graphics
-        ;; displays often use faces that make them more than one `line'
-        ;; high, and so obscure the last line of the window proper.
-        (setq win-height (1- win-height)))
       (enlarge-window (- new-height win-height)))))
 
 ;; `help-manyarg-func-alist' is defined primitively (in doc.c).