mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-09 01:05:39 -08:00
Code Issues Projects Releases Wiki Activity

Close bug#5670 with patch from Štěpán Němec <stepnem at gmail.com>.

Browse source 
* subr.el (momentary-string-display): Don't overwrite the MESSAGE
argument with a local variable.  (Bug#5670)
This commit is contained in:
Štěpán Němec 2010-03-02 19:58:26 -08:00 • committed by Glenn Morris
parent 1ddd662297
commit bc91aee966
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2010-03-03 Štěpán Němec <stepnem@gmail.com>
* subr.el (momentary-string-display): Don't overwrite the MESSAGE
argument with a local variable. (Bug#5670)
2010-03-02 Juri Linkov <juri@jurta.org>
* info.el (Info-index-next): Decrement line number by 2. (Bug#5652)

6
lisp/subr.el
View file

@ -2196,15 +2196,15 @@ Display MESSAGE (optional fourth arg) in the echo area.
If MESSAGE is nil, instructions to type EXIT-CHAR are displayed there."
(or exit-char (setq exit-char ?\s))
(let ((ol (make-overlay pos pos))
(message (copy-sequence string)))
(str (copy-sequence string)))
(unwind-protect
(progn
(save-excursion
(overlay-put ol 'after-string message)
(overlay-put ol 'after-string str)
(goto-char pos)
;; To avoid trouble with out-of-bounds position
(setq pos (point))
;; If the message end is off screen, recenter now.
;; If the string end is off screen, recenter now.
(if (<= (window-end nil t) pos)
(recenter (/ (window-height) 2))))
(message (or message "Type %s to continue editing.")