Mercurial > emacs
changeset 107329:4e1ca27d938e
Close bug#5670 with patch from ?t?pn N?mec <stepnem at gmail.com>.
* subr.el (momentary-string-display): Don't overwrite the MESSAGE
argument with a local variable. (Bug#5670)
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 02 Mar 2010 19:58:26 -0800 |
| parents | 11f018190d5c |
| children | 6797d961af8b |
| files | lisp/ChangeLog lisp/subr.el |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Mar 02 19:50:15 2010 -0800 +++ b/lisp/ChangeLog Tue Mar 02 19:58:26 2010 -0800 @@ -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)
--- a/lisp/subr.el Tue Mar 02 19:50:15 2010 -0800 +++ b/lisp/subr.el Tue Mar 02 19:58:26 2010 -0800 @@ -2196,15 +2196,15 @@ 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.")