summaryrefslogtreecommitdiff
path: root/lisp/emulation
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2022-04-28 18:37:34 +0300
committerEli Zaretskii <eliz@gnu.org>2022-04-28 18:37:34 +0300
commitb3023de5431fc308e2a6db61ed4fdd18db785324 (patch)
treeca1c8f1adcde2d7192fe7991a672a89139f2610e /lisp/emulation
parent904aaabb0516b98b6195b3e8a37ea85d50a8d185 (diff)
parent3b6338c8c351cce721f2f1aa115cadc401179d5c (diff)
downloademacs-b3023de5431fc308e2a6db61ed4fdd18db785324.tar.gz
Merge from origin/emacs-28
# Conflicts: # lisp/progmodes/xref.el
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/viper-cmd.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 54838638d6c..ddb49609d40 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -4164,7 +4164,12 @@ cursor move past the beginning of line."
"Query replace.
If a null string is supplied as the string to be replaced,
the query replace mode will toggle between string replace
-and regexp replace."
+and regexp replace.
+
+As each match is found, the user must type a character saying
+what to do with it. Type SPC or `y' to replace the match,
+DEL or `n' to skip and go to the next match. For more directions,
+type \\[help-command] at that time."
(interactive)
(let (str)
(setq str (viper-read-string-with-history