[Emacs-diffs] /srv/bzr/emacs/trunk r99609: Close bug #5670 with patch from Štěpán Něme c <stepnem at gmail.com>.

[Glenn Morris]

------------------------------------------------------------
revno: 99609
author: Stepán Nemec <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-03-02 19:58:26 -0800
message:
  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)
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-02 21:15:46 +0000
+++ b/lisp/ChangeLog    2010-03-03 03:58:26 +0000
@@ -1,3 +1,8 @@
+2010-03-03  Štěpán Němec  <address@hidden>
+
+       * subr.el (momentary-string-display): Don't overwrite the MESSAGE
+       argument with a local variable.  (Bug#5670)
+
 2010-03-02  Juri Linkov  <address@hidden>
 
        * info.el (Info-index-next): Decrement line number by 2.  (Bug#5652)

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2010-02-20 08:59:16 +0000
+++ b/lisp/subr.el      2010-03-03 03:58:26 +0000
@@ -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.")