(perform-replace): Before recursive edit,

get the match data as markers, and set real-match-data.

diff --git a/lisp/replace.el b/lisp/replace.el
index 9a2da5fc2e621520baca4ac3aecfd1c8cc1fb6be..ebe3088c04e856164567a30f0d2feaf182428aaf 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -846,9 +846,11 @@ which will run faster and probably do exactly what you want."
                      ((eq def 'recenter)
                       (recenter nil))
                      ((eq def 'edit)
-                      (set-match-data
-                       (prog1 (match-data)
-                         (save-excursion (recursive-edit))))
+                      (goto-char (match-beginning 0))
+                      (funcall search-function search-string limit t)
+                      (setq real-match-data (match-data))
+                      (save-excursion (recursive-edit))
+                      (set-match-data real-match-data)
                       ;; Before we make the replacement,
                       ;; decide whether the search string
                       ;; can match again just after this match.