aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/replace.el
diff options
context:
space:
mode:
authorRichard M. Stallman2007-01-12 22:33:09 +0000
committerRichard M. Stallman2007-01-12 22:33:09 +0000
commitfbea9ee8302efe1f77c64ff2eeffe233fd2a699e (patch)
tree21ad109d37c8251be28b17286d896b67035fe557 /lisp/replace.el
parent7b3eaed564d3e8c1edacd383c9124d4c9130d328 (diff)
downloademacs-fbea9ee8302efe1f77c64ff2eeffe233fd2a699e.tar.gz
emacs-fbea9ee8302efe1f77c64ff2eeffe233fd2a699e.zip
(perform-replace): Don't clear NODENT when computing the replacement string.
Diffstat (limited to 'lisp/replace.el')
-rw-r--r--lisp/replace.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/replace.el b/lisp/replace.el
index c51985c3e4a..0e1435824e1 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1406,6 +1406,8 @@ make, or the user didn't cancel the call."
1406 (search-string from-string) 1406 (search-string from-string)
1407 (real-match-data nil) ; the match data for the current match 1407 (real-match-data nil) ; the match data for the current match
1408 (next-replacement nil) 1408 (next-replacement nil)
1409 ;; This is non-nil if we know there is nothing for the user
1410 ;; to edit in the replacement.
1409 (noedit nil) 1411 (noedit nil)
1410 (keep-going t) 1412 (keep-going t)
1411 (stack nil) 1413 (stack nil)
@@ -1517,8 +1519,7 @@ make, or the user didn't cancel the call."
1517 (set-match-data real-match-data) 1519 (set-match-data real-match-data)
1518 (setq next-replacement 1520 (setq next-replacement
1519 (funcall (car replacements) (cdr replacements) 1521 (funcall (car replacements) (cdr replacements)
1520 replace-count) 1522 replace-count) nil))
1521 noedit nil))
1522 (if (not query-flag) 1523 (if (not query-flag)
1523 (let ((inhibit-read-only 1524 (let ((inhibit-read-only
1524 query-replace-skip-read-only)) 1525 query-replace-skip-read-only))