andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Chong Yidong 2007-03-19 18:28:31 +00:00
parent a5ffe5c632
commit 39a8d88a7f
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -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

7
lisp/simple.el
View file

@ -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