From: Eli Zaretskii Date: Thu, 21 Apr 2022 18:56:09 +0000 (+0300) Subject: ; Fix last change in isearch.el X-Git-Tag: emacs-28.1.90~115 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e93e31c8952bf8a7acf898e4ff4d6541c897e12c;p=emacs.git ; 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. --- 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." (defun isearch-query-replace-regexp (&optional arg) "Start `query-replace-regexp' with string to replace from last search string. -See `isearch-query-replace' for more information." +See `isearch-query-replace' for more information. + +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 (list current-prefix-arg)) (isearch-query-replace arg t)) @@ -2398,12 +2403,7 @@ the search words, ignoring punctuation. If the last search command was a regular expression search, REGEXP is the regular expression used in that search. If the last search command searched for a literal string, REGEXP is constructed by quoting all the special -characters in that string. - -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." +characters in that string." (interactive (let* ((perform-collect (consp current-prefix-arg)) (regexp (cond