diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/simple.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b01328b58bf..d91434f318e 100644 --- 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 d0fecbc3586..9ca1cf2c9f3 100644 --- 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 |