(display-message-or-buffer): Count screen lines instead of buffer lines when

determining whether the message will fit in the echo area/minibuffer window.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b01328b58bf92e46c4f9411d78cf4671480cdb4f..d91434f318e593c02eee238372a3c4a7cc48da8a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-04  Kevin Rodgers  <ihs_4664@yahoo.com>
+
+       * simple.el (display-message-or-buffer): Count screen lines
+       instead of buffer lines when determining whether the message
+       will fit in the echo area/minibuffer window.
+
 2006-02-04  Eli Zaretskii  <eliz@gnu.org>
 
        * info.el (Info-index, Info-mode): Improve the description of the

diff --git a/lisp/simple.el b/lisp/simple.el
index d0fecbc358602d88d4f86ab410b296f2fa296c04..9ca1cf2c9f373b7f4fa7dede486d4e75ac0e4f90 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1922,7 +1922,7 @@ and only used if a buffer is displayed."
           (let ((lines
                  (if (= (buffer-size) 0)
                      0
-                   (count-lines (point-min) (point-max)))))
+                   (count-screen-lines nil nil nil (minibuffer-window)))))
             (cond ((= lines 0))
                   ((and (or (<= lines 1)
                             (<= lines