]> git.eshelyaron.com Git - emacs.git/commitdiff
Backport: Fix an assignment to free variable warning
authorTino Calancha <tino.calancha@gmail.com>
Tue, 17 Sep 2019 16:07:50 +0000 (18:07 +0200)
committerTino Calancha <tino.calancha@gmail.com>
Tue, 17 Sep 2019 16:16:14 +0000 (18:16 +0200)
It fixes a bug introduced by commit
'query-replace-regexp undo: Update next-replacement after undo'
(30c4f35a6fc8a6507930923766c3126ac1c2063f)

See https://lists.gnu.org/archive/html/emacs-devel/2019-09/msg00364.html
* lisp/replace.el(perform-replace): Rename variable
to next-replacement-replaced.

(cherry picked from commit cbc10ec71e9f189e8d6fd5c6927aec4872e0fd96)

lisp/replace.el

index dd24d8ba923b9fd05eb86292bbbbd5c1a079a38f..6dba7d77a881a132df6324ceae8e1ffabbc76175 100644 (file)
@@ -2597,7 +2597,7 @@ It must return a string."
                                   search-string (nth (if replaced 4 3) elt)
                                   last-replacement (nth (if replaced 3 4) elt)
                                   search-string-replaced search-string
-                                  last-replacement-replaced last-replacement
+                                  next-replacement-replaced last-replacement
                                   last-was-act-and-show nil)
 
                                  (when (and (= stack-idx stack-len)