diff options
| author | Richard M. Stallman <rms@gnu.org> | 2007-01-12 22:33:09 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2007-01-12 22:33:09 +0000 |
| commit | fbea9ee8302efe1f77c64ff2eeffe233fd2a699e (patch) | |
| tree | 21ad109d37c8251be28b17286d896b67035fe557 | |
| parent | 7b3eaed564d3e8c1edacd383c9124d4c9130d328 (diff) | |
| download | emacs-fbea9ee8302efe1f77c64ff2eeffe233fd2a699e.tar.gz | |
(perform-replace): Don't clear NODENT when computing the replacement string.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/replace.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4ed8a4c18dc..790867a36b5 100644 --- 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 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)) |