(perform-replace): Don't clear NODENT when computing the replacement string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ed8a4c..790867a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-12  Richard Stallman  <rms@gnu.org>
+
+       * replace.el (perform-replace): Don't clear NODENT when computing
+       the replacement string.
+
 2007-01-11  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-handle-file-local-copy): Set

diff --git a/lisp/replace.el b/lisp/replace.el
index c51985c..0e14358 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1406,6 +1406,8 @@ make, or the user didn't cancel the call."
        (search-string from-string)
        (real-match-data nil)           ; the match data for the current match
        (next-replacement nil)
+       ;; This is non-nil if we know there is nothing for the user
+       ;; to edit in the replacement.
        (noedit nil)
        (keep-going t)
        (stack nil)
@@ -1517,8 +1519,7 @@ make, or the user didn't cancel the call."
              (set-match-data real-match-data)
              (setq next-replacement
                    (funcall (car replacements) (cdr replacements)
-                            replace-count)
-                   noedit nil))
+                            replace-count) nil))
            (if (not query-flag)
                (let ((inhibit-read-only
                       query-replace-skip-read-only))