Revert 2006-02-04 change by Kevin Rodgers due to lack of legal papers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a43823920c00e173a3b662714f02ccaa0c53e18..b119505d032dad1aad6710d2d7ece15a475a4b24 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -12349,14 +12349,6 @@
        * files.el (magic-mode-regexp-match-limit): New defvar.
        (set-auto-mode): Use it to limit magic-mode-alist matching.
 
-2006-02-04  Kevin Rodgers  <ihs_4664@yahoo.com>
-
-       * simple.el (display-message-or-buffer): Compare the number of
-       characters to the frame width when determining whether a 1-line
-       message string will fit in the echo area.  Count screen lines
-       instead of buffer lines when determining whether a multi-line
-       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 1f233de98572a4fa6d9e47d2d3d13fa56c8def70..5bbfa3179586a04e7e9e93c502fb59f09c79b258 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1910,14 +1910,11 @@ the contents are inserted into the buffer anyway.
 
 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))
-             (<= (length message) (frame-width)))
+  (cond ((and (stringp message) (not (string-match "\n" message)))
         ;; Trivial case where we can use the echo area
         (message "%s" message))
        ((and (stringp message)
-             (= (string-match "\n" message) (1- (length message)))
-             (<= (1- (length message)) (frame-width)))
+             (= (string-match "\n" message) (1- (length message))))
         ;; Trivial case where we can just remove single trailing newline
         (message "%s" (substring message 0 (1- (length message)))))
        (t