summaryrefslogtreecommitdiff
path: root/lisp/simple.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2006-02-04 12:19:27 +0000
committerEli Zaretskii <eliz@gnu.org>2006-02-04 12:19:27 +0000
commit62ffcd76a94fd453bede61d63d50d697da6f518f (patch)
tree6c5725be00dc819d76cb06ceff003a24c06aff8e /lisp/simple.el
parent4a99f153c4f529f8bc531dce406440b6bf10ce10 (diff)
downloademacs-62ffcd76a94fd453bede61d63d50d697da6f518f.tar.gz
emacs-62ffcd76a94fd453bede61d63d50d697da6f518f.tar.bz2
emacs-62ffcd76a94fd453bede61d63d50d697da6f518f.zip
(display-message-or-buffer): Count screen lines instead of buffer lines when
determining whether the message will fit in the echo area/minibuffer window.
Diffstat (limited to 'lisp/simple.el')
-rw-r--r--lisp/simple.el2
1 files changed, 1 insertions, 1 deletions
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