; * lisp/replace.el (query-replace-help): Fix help text (bug#78916).

(cherry picked from commit 3f7787c9794c44b277108afae1c1d4b81ff716de)

diff --git a/lisp/replace.el b/lisp/replace.el
index f88c181f33b07b9ed4a226b951c98ccc39c86d6f..042aee251745fe8aeb220bed8a7d8f56ede537cb 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2427,19 +2427,21 @@ To be added to `context-menu-functions'."
   "Type \\`SPC' or \\`y' to replace one match, Delete or \\`n' to skip to next,
 \\`RET' or \\`q' to exit, Period to replace one match and exit,
 \\`,' to replace but not move point immediately,
-\\`C-r' to enter recursive edit (\\[exit-recursive-edit] to get out again),
-\\`C-w' to delete match and recursive edit,
-\\`C-l' to clear the screen, redisplay, and offer same replacement again,
 \\`!' to replace all remaining matches in this buffer with no more questions,
+\\`C-r' to enter recursive edit (\\[exit-recursive-edit] to get out again),
+\\`C-w' to delete match and then enter recursive edit,
 \\`^' to move point back to previous match,
 \\`u' to undo previous replacement,
 \\`U' to undo all replacements,
 \\`e' to edit the replacement string.
 \\`E' to edit the replacement string with exact case.
-In multi-buffer replacements type \\`Y' to replace all remaining
-matches in all remaining buffers with no more questions,
-\\`N' to skip to the next buffer without replacing remaining matches
-in the current buffer."
+\\`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,
+\\`N' (in multi-buffer replacements) to skip to the next buffer without
+replacing remaining matches in the current buffer.
+Any other character exits interactive replacement loop and is then
+re-executed as a normal key sequence."
   "Help message while in `query-replace'.")
 
 (defvar query-replace-map