aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2022-04-21 21:56:09 +0300
committerEli Zaretskii2022-04-21 21:56:09 +0300
commite93e31c8952bf8a7acf898e4ff4d6541c897e12c (patch)
tree1c13a1c4cb65de55bc748ece2b9b46dfe7cff761
parent16d1ab02af3335db38e596cfe8ff9c3d1db157ed (diff)
downloademacs-e93e31c8952bf8a7acf898e4ff4d6541c897e12c.tar.gz
emacs-e93e31c8952bf8a7acf898e4ff4d6541c897e12c.zip
; Fix last change in isearch.el
* lisp/isearch.el (isearch-occur): Move the recent addition to doc string from here... (isearch-query-replace-regexp): ...to here.
-rw-r--r--lisp/isearch.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index d829744c3a4..a68c3a4748c 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2383,7 +2383,12 @@ type \\[help-command] at that time."
2383 2383
2384(defun isearch-query-replace-regexp (&optional arg) 2384(defun isearch-query-replace-regexp (&optional arg)
2385 "Start `query-replace-regexp' with string to replace from last search string. 2385 "Start `query-replace-regexp' with string to replace from last search string.
2386See `isearch-query-replace' for more information." 2386See `isearch-query-replace' for more information.
2387
2388As each match is found, the user must type a character saying
2389what to do with it. Type SPC or `y' to replace the match,
2390DEL or `n' to skip and go to the next match. For more directions,
2391type \\[help-command] at that time."
2387 (interactive 2392 (interactive
2388 (list current-prefix-arg)) 2393 (list current-prefix-arg))
2389 (isearch-query-replace arg t)) 2394 (isearch-query-replace arg t))
@@ -2398,12 +2403,7 @@ the search words, ignoring punctuation. If the last search
2398command was a regular expression search, REGEXP is the regular 2403command was a regular expression search, REGEXP is the regular
2399expression used in that search. If the last search command searched 2404expression used in that search. If the last search command searched
2400for a literal string, REGEXP is constructed by quoting all the special 2405for a literal string, REGEXP is constructed by quoting all the special
2401characters in that string. 2406characters in that string."
2402
2403As each match is found, the user must type a character saying
2404what to do with it. Type SPC or `y' to replace the match,
2405DEL or `n' to skip and go to the next match. For more directions,
2406type \\[help-command] at that time."
2407 (interactive 2407 (interactive
2408 (let* ((perform-collect (consp current-prefix-arg)) 2408 (let* ((perform-collect (consp current-prefix-arg))
2409 (regexp (cond 2409 (regexp (cond