diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2007-03-19 18:28:31 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2007-03-19 18:28:31 +0000 |
| commit | 39a8d88a7f9d5f08cd7c17d5101748337cd72abd (patch) | |
| tree | 086fae111ccd42dd57aad58b36ec7a1f06149aef /lisp/simple.el | |
| parent | a5ffe5c63214829bfd5fa09d50cff0e8607ae1b8 (diff) | |
| download | emacs-39a8d88a7f9d5f08cd7c17d5101748337cd72abd.tar.gz | |
Revert 2006-02-04 change by Kevin Rodgers due to lack of legal papers.
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 1f233de9857..5bbfa317958 100644 --- 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 |