summaryrefslogtreecommitdiff
path: root/lisp/replace.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2007-01-12 22:32:46 +0000
committerRichard M. Stallman <rms@gnu.org>2007-01-12 22:32:46 +0000
commit667fb9c5afdb922dcbe4b3726c017c0fcb409c25 (patch)
treec1d2410bb418c9fa50879de4d09f8b3a03789ed8 /lisp/replace.el
parentbf816ce4f279397f1ee4d4d1a148888b4b092049 (diff)
downloademacs-667fb9c5afdb922dcbe4b3726c017c0fcb409c25.tar.gz
(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."
(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))