Mercurial > emacs
changeset 76579:57d392645f54
Revert 2006-02-04 change by Kevin Rodgers due to lack of legal papers.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 19 Mar 2007 18:28:31 +0000 |
| parents | da31763249be |
| children | a9fa8e107bbc |
| files | lisp/ChangeLog lisp/simple.el |
| diffstat | 2 files changed, 2 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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
--- 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