summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/replace.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf7e4aa4e19..4bd9e5b7189 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-26 David Kastrup <dak@gnu.org>
+
+ * replace.el (perform-replace): Highlight the match even in
+ non-query mode if there is potential replace string editing.
+
2004-06-26 Kai Grossjohann <kai.grossjohann@gmx.net>
* net/tramp.el (tramp-handle-file-remote-p): New implementation to
diff --git a/lisp/replace.el b/lisp/replace.el
index 0ae9f084846..c68a420db7a 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1328,7 +1328,11 @@ make, or the user didn't cancel the call."
replace-count)
noedit nil))
(if (not query-flag)
- (let ((inhibit-read-only query-replace-skip-read-only))
+ (let ((inhibit-read-only
+ query-replace-skip-read-only))
+ (unless noedit
+ (replace-highlight (nth 0 real-match-data)
+ (nth 1 real-match-data)))
(setq noedit
(replace-match-maybe-edit
next-replacement nocasify literal