diff options
| author | David Kastrup | 2004-06-26 18:35:18 +0000 |
|---|---|---|
| committer | David Kastrup | 2004-06-26 18:35:18 +0000 |
| commit | cb05ca25df6d4dca3024b94731aaee12bfce4ad6 (patch) | |
| tree | f97721b043c9e87b1982bc48a3ed2c67f26ba21e /lisp | |
| parent | 15cc764cd1a590eccf9516effbe28df61c78a02a (diff) | |
| download | emacs-cb05ca25df6d4dca3024b94731aaee12bfce4ad6.tar.gz emacs-cb05ca25df6d4dca3024b94731aaee12bfce4ad6.zip | |
(perform-replace): Highlight the match even in
non-query mode if there is potential replace string editing.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/replace.el | 6 |
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 @@ | |||
| 1 | 2004-06-26 David Kastrup <dak@gnu.org> | ||
| 2 | |||
| 3 | * replace.el (perform-replace): Highlight the match even in | ||
| 4 | non-query mode if there is potential replace string editing. | ||
| 5 | |||
| 1 | 2004-06-26 Kai Grossjohann <kai.grossjohann@gmx.net> | 6 | 2004-06-26 Kai Grossjohann <kai.grossjohann@gmx.net> |
| 2 | 7 | ||
| 3 | * net/tramp.el (tramp-handle-file-remote-p): New implementation to | 8 | * 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." | |||
| 1328 | replace-count) | 1328 | replace-count) |
| 1329 | noedit nil)) | 1329 | noedit nil)) |
| 1330 | (if (not query-flag) | 1330 | (if (not query-flag) |
| 1331 | (let ((inhibit-read-only query-replace-skip-read-only)) | 1331 | (let ((inhibit-read-only |
| 1332 | query-replace-skip-read-only)) | ||
| 1333 | (unless noedit | ||
| 1334 | (replace-highlight (nth 0 real-match-data) | ||
| 1335 | (nth 1 real-match-data))) | ||
| 1332 | (setq noedit | 1336 | (setq noedit |
| 1333 | (replace-match-maybe-edit | 1337 | (replace-match-maybe-edit |
| 1334 | next-replacement nocasify literal | 1338 | next-replacement nocasify literal |