[Emacs-diffs] Changes to emacs/lisp/simple.el

[Eli Zaretskii]

Index: emacs/lisp/simple.el
diff -u emacs/lisp/simple.el:1.789 emacs/lisp/simple.el:1.790
--- emacs/lisp/simple.el:1.789  Sat Feb  4 12:18:57 2006
+++ emacs/lisp/simple.el        Sat Feb  4 21:48:20 2006
@@ -1901,11 +1901,14 @@
 
 Optional arguments NOT-THIS-WINDOW and FRAME are as for `display-buffer',
 and only used if a buffer is displayed."
-  (cond ((and (stringp message) (not (string-match "\n" message)))
+  (cond ((and (stringp message)
+             (not (string-match "\n" message))
+             (<= (length message) (frame-width)))
         ;; Trivial case where we can use the echo area
         (message "%s" message))
        ((and (stringp message)
-             (= (string-match "\n" message) (1- (length message))))
+             (= (string-match "\n" message) (1- (length message)))
+             (<= (1- (length message)) (frame-width)))
         ;; Trivial case where we can just remove single trailing newline
         (message "%s" (substring message 0 (1- (length message)))))
        (t