From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#55050: 27.2; Doc strings for commands that do query-replacements Date: Thu, 21 Apr 2022 19:04:42 +0300 Organization: LINKOV.NET Message-ID: <86czhatp2d.fsf@mail.linkov.net> References: <83v8v2r6cz.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22446"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) Cc: 55050-done@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Apr 21 18:41:28 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nhZrz-0005jX-Iu for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 21 Apr 2022 18:41:27 +0200 Original-Received: from localhost ([::1]:34172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhZry-0007na-8n for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 21 Apr 2022 12:41:26 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhZJj-0000zZ-Nv for bug-gnu-emacs@gnu.org; Thu, 21 Apr 2022 12:06:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:56938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhZJi-0005fH-IZ for bug-gnu-emacs@gnu.org; Thu, 21 Apr 2022 12:06:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nhZJi-0004rA-BV for bug-gnu-emacs@gnu.org; Thu, 21 Apr 2022 12:06:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 21 Apr 2022 16:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55050 X-GNU-PR-Package: emacs Original-Received: via spool by 55050-done@debbugs.gnu.org id=D55050.165055711518244 (code D ref 55050); Thu, 21 Apr 2022 16:06:02 +0000 Original-Received: (at 55050-done) by debbugs.gnu.org; 21 Apr 2022 16:05:15 +0000 Original-Received: from localhost ([127.0.0.1]:50831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhZIx-0004kB-8X for submit@debbugs.gnu.org; Thu, 21 Apr 2022 12:05:15 -0400 Original-Received: from relay12.mail.gandi.net ([217.70.178.232]:44631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nhZIv-0004jM-CM for 55050-done@debbugs.gnu.org; Thu, 21 Apr 2022 12:05:14 -0400 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 50769200004; Thu, 21 Apr 2022 16:05:05 +0000 (UTC) In-Reply-To: <83v8v2r6cz.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 21 Apr 2022 15:03:24 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:230387 Archived-At: > So I added the minimal instructions to all the commands I found which > perform query-replace of some sort: how to accept a replacement and > how to skip it -- with a reference to 'h' that will show the full > instructions. This, of course, is _in_addition_ to the already > existing link to 'query-replace'/'query-replace-regexp', which in > itself is a reference to that stuff. Actually this change was in isearch-occur unrelated to query-replace. Maybe you meant to add it to isearch-query-replace-regexp? diff --git a/lisp/isearch.el b/lisp/isearch.el index 34e3b69475..d829744c3a 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -2393,7 +2398,12 @@ isearch-occur 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." +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." (interactive (let* ((perform-collect (consp current-prefix-arg)) (regexp (cond