# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1267588706 28800
# Node ID 4e1ca27d938e1695a36fb4372be67adf27f31339
# Parent  11f018190d5ceba3b971fdfbe00951cd9ff53678
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 -r 11f018190d5c -r 4e1ca27d938e lisp/ChangeLog
--- 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)
diff -r 11f018190d5c -r 4e1ca27d938e lisp/subr.el
--- 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.")