From 62ffcd76a94fd453bede61d63d50d697da6f518f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Feb 2006 12:19:27 +0000 Subject: (display-message-or-buffer): Count screen lines instead of buffer lines when determining whether the message will fit in the echo area/minibuffer window. --- lisp/ChangeLog | 6 ++++++ lisp/simple.el | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'lisp') 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 + + * 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 * 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 -- cgit v1.2.1