# HG changeset patch # User Chong Yidong # Date 1174328911 0 # Node ID 57d392645f5461a5b12f2a84c00237849ced93cc # Parent da31763249bea36ec311ef3d059a915155adacc1 Revert 2006-02-04 change by Kevin Rodgers due to lack of legal papers. diff -r da31763249be -r 57d392645f54 lisp/ChangeLog --- a/lisp/ChangeLog Mon Mar 19 18:25:22 2007 +0000 +++ b/lisp/ChangeLog Mon Mar 19 18:28:31 2007 +0000 @@ -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 - - * 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 * info.el (Info-index, Info-mode): Improve the description of the diff -r da31763249be -r 57d392645f54 lisp/simple.el --- a/lisp/simple.el Mon Mar 19 18:25:22 2007 +0000 +++ b/lisp/simple.el Mon Mar 19 18:28:31 2007 +0000 @@ -1910,14 +1910,11 @@ 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