# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1139055537 0
# Node ID 28a6ea7067637c540c4cf97db32afe7fb1f6f624
# Parent  eab4b9f68f93960a321598549af004fbc7cf5723
(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 -r eab4b9f68f93 -r 28a6ea706763 lisp/simple.el
--- a/lisp/simple.el	Sat Feb 04 12:12:39 2006 +0000
+++ b/lisp/simple.el	Sat Feb 04 12:18:57 2006 +0000
@@ -1922,7 +1922,7 @@
 	   (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