Show the diff buffer with replacements by typing 'd' in 'query-replace'

* doc/emacs/search.texi (Query Replace): Mention new key 'd'.

* lisp/replace.el (query-replace-help): Mention the key 'd'.
(query-replace-map): Bind the key 'd' to 'diff'.
(perform-replace): When 'def' is equal to 'diff',
call 'multi-file-replace-as-diff' to show the diff buffer
with replacements (bug#79761).

1 files changed, 13 insertions, 1 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index 6635cc6afe4..b0689b93e06 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2459,6 +2459,7 @@ To be added to `context-menu-functions'."
 \\`U' to undo all replacements,
 \\`e' to edit the replacement string.
 \\`E' to edit the replacement string with exact case.
+\\`d' to display the diff buffer with all replacements.
 \\`C-l' to clear the screen, redisplay, and offer same replacement again,
 \\`Y' to replace all remaining matches in all remaining buffers (in
 multi-buffer replacements) with no more questions,
@@ -2492,6 +2493,7 @@ re-executed as a normal key sequence."
     (define-key map "^" 'backup)
     (define-key map "u" 'undo)
     (define-key map "U" 'undo-all)
+    (define-key map "d" 'diff)
     (define-key map "\C-h" 'help)
     (define-key map [f1] 'help)
     (define-key map [help] 'help)
@@ -2518,7 +2520,7 @@ The valid answers include `act', `skip', `act-and-show',
 `scroll-down', `scroll-other-window', `scroll-other-window-down',
 `edit', `edit-replacement', `edit-replacement-exact-case',
 `delete-and-edit', `automatic', `backup', `undo', `undo-all',
-`quit', and `help'.
+`diff', `quit', and `help'.
 
 This keymap is used by `y-or-n-p' as well as `query-replace'.")
 
@@ -3334,6 +3336,16 @@ characters."
                          (replace-dehighlight)
                          (save-excursion (recursive-edit))
                          (setq replaced t))
+
+                        ((eq def 'diff)
+                         (let ((display-buffer-overriding-action
+                                '(nil (inhibit-same-window . t))))
+                           (save-selected-window
+                             (multi-file-replace-as-diff
+                              (list (or buffer-file-name (current-buffer)))
+                              from-string (or replacements next-replacement)
+                              regexp-flag delimited-flag))))
+
                         ((commandp def t)
                          (call-interactively def))
                         ;; Note: we do not need to treat `exit-prefix'