From: Štěpán Němec <stepnem@gmail.com>
Date: Wed, 3 Mar 2010 03:58:26 +0000 (-0800)
Subject: Close bug#5670 with patch from Štěpán Němec <stepnem at gmail.com>.
X-Git-Tag: emacs-pretest-23.1.94~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc91aee9669b7cb67c981e31201d76df0edd9aeb;p=emacs.git

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

* subr.el (momentary-string-display): Don't overwrite the MESSAGE
argument with a local variable.  (Bug#5670)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 607154f9c3c..016ab7b431f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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)
diff --git a/lisp/subr.el b/lisp/subr.el
index 977d5a53f35..be06a558e5a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -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.")