From unknown Sun Jun 22 17:17:59 2025 X-Loop: help-debbugs@gnu.org Subject: bug#30064: 27.0.50; Improve grammar of map-y-or-n-p help text Resent-From: "Basil L. Contovounesios" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 10 Jan 2018 14:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 30064 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 30064@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.151559436030330 (code B ref -1); Wed, 10 Jan 2018 14:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jan 2018 14:26:00 +0000 Received: from localhost ([127.0.0.1]:50375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eZHKK-0007t8-K5 for submit@debbugs.gnu.org; Wed, 10 Jan 2018 09:26:00 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eZHKI-0007sv-Lo for submit@debbugs.gnu.org; Wed, 10 Jan 2018 09:25:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZHKC-0000r7-5G for submit@debbugs.gnu.org; Wed, 10 Jan 2018 09:25:53 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35948) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZHKC-0000qp-2G for submit@debbugs.gnu.org; Wed, 10 Jan 2018 09:25:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZHK7-0003wa-O3 for bug-gnu-emacs@gnu.org; Wed, 10 Jan 2018 09:25:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZHK4-0000mc-KQ for bug-gnu-emacs@gnu.org; Wed, 10 Jan 2018 09:25:47 -0500 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:34115) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZHK4-0000lL-Ct for bug-gnu-emacs@gnu.org; Wed, 10 Jan 2018 09:25:44 -0500 Received: by mail-wm0-x22a.google.com with SMTP id 81so2100568wmb.1 for ; Wed, 10 Jan 2018 06:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=QeQQHEDL49EqtLKsPTJQu8rlYBPPKWpiIS2iaoe/M+Y=; b=VhYPWzVwyQWdep0aM22Nmc8oMo0m7/sB05obVjPmAyIyy/Tu5LjszoUHtnXFnFT+2e QBwjyO6ZEWOkMXkK79MSw2YyjTYp0y9BTDlxMLn5Ve+O96nZb1W8Ef+Xl7sC+/2t6ga5 O/ykbr46K+KgDycjB9R+GL0fXltxmkHfukhwMMfQ2y2DV0pxDH1JSFG6cXiZzMfNLpeM A+pV54LqNPe3+xJF1+D2EmbARr9HEDthBg+doboLBCO+AdehTVRq8ZSiLODoTWs2A4ig M5rm2wVYGJpcZhMQVw3+DOyXJEnz/aZDAS+Vq9SIDFhIkhkDm9TiTb2BmqybgCklpNEr 6aTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=QeQQHEDL49EqtLKsPTJQu8rlYBPPKWpiIS2iaoe/M+Y=; b=OUJ/k+CF8FwaQgtXjVv9fU6oVAM3jmAr2QrGEG4sxUR/DnkN3ElljY9HJuq1YQMJ8D T2FBRO9l5Y3yVfjJhAiq+LX1WKej7GFJWH7AQPzz3fPSzv0s4mqnU8k1sIYe1Ymwomco eD8ju1QHXEI2m2M079tnqSrfXf9/ic+N7NIZ8oOuxDZTKPf430tTDrkFS+jk/QC4WcAA /IUr5rppfHbCWJSe5is3bwJqdWphbKadcPDhhcrf4Udszo0+b4vrtzZhOWzYP+hKwcv4 PZTdJ1Oh8Bg13lo7IxH6RJGfcNeuWhtq+zQbwaD/c794/gl1eAZejxbnnZgbz1g/RlFu m6QQ== X-Gm-Message-State: AKwxytcn1gBQSPhZQFnPJCQk6rGD/6zpH2Lv3kEf8zgbJpF1kCMHecDJ uVxg1TMZbIGn9HkydTMN6nsMkh0k X-Google-Smtp-Source: ACJfBotEBDz6pXZxNy9i6IqbPWVj0ZlIVIUke4APDbSowfflDFqzmpmPa+qoSOHW5ViN7+x5E2trUw== X-Received: by 10.80.182.181 with SMTP id d50mr1920539ede.116.1515594342622; Wed, 10 Jan 2018 06:25:42 -0800 (PST) Received: from localhost ([213.233.148.28]) by smtp.gmail.com with ESMTPSA id 4sm9246954edf.81.2018.01.10.06.25.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Jan 2018 06:25:41 -0800 (PST) From: "Basil L. Contovounesios" Date: Wed, 10 Jan 2018 14:25:36 +0000 Message-ID: <871sixg59b.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Improve-grammar-of-map-y-or-n-p-help-text.patch >From c846d0f52a398e97f0cf705c2ae17a93629e2e66 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Wed, 10 Jan 2018 13:55:29 +0000 Subject: [PATCH] Improve grammar of map-y-or-n-p help text * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Do not follow a definite article with an action verb in C-h help text. --- lisp/emacs-lisp/map-ynp.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index 2a7eddedad..5aa2a6fad1 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -197,14 +197,14 @@ map-y-or-n-p (objects (if help (nth 1 help) "objects")) (action (if help (nth 2 help) "act on"))) (concat - (format-message "\ + (format-message + "\ Type SPC or `y' to %s the current %s; DEL or `n' to skip the current %s; -RET or `q' to give up on the %s (skip all remaining %s); +RET or `q' to skip the current and all remaining %s; C-g to quit (cancel the whole command); ! to %s all remaining %s;\n" - action object object action objects action - objects) + action object object objects action objects) (mapconcat (function (lambda (elt) (format "%s to %s" -- 2.15.1 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable The help text displayed by the function map-y-or-n-p when the user types C-h contains the following grammatically dubious phrase: RET or =E2=80=98q=E2=80=99 to give up on the act on (skip all remaining o= bjects); ^^^^^^^^^^ where an (configurable) action verb follows the definite article. I attach a patch to both avoid this and clarify that the current object is skipped as well as all remaining ones. Thanks, --=20 Basil In GNU Emacs 27.0.50 (build 13, x86_64-pc-linux-gnu, X toolkit, Xaw3d scrol= l bars) of 2018-01-03 built on thunk Repository revision: f8b4e87d5d4f57954b50677add76ce5136211dc1 Windowing system distributor 'The X.Org Foundation', version 11.0.11905000 System Description: Debian GNU/Linux testing (buster) --=-=-=-- From unknown Sun Jun 22 17:17:59 2025 X-Loop: help-debbugs@gnu.org Subject: bug#30064: 27.0.50; Improve grammar of map-y-or-n-p help text Resent-From: "Basil L. Contovounesios" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 10 Jan 2018 15:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 30064 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: <30064@debbugs.gnu.org> Received: via spool by 30064-submit@debbugs.gnu.org id=B30064.151559795111386 (code B ref 30064); Wed, 10 Jan 2018 15:26:01 +0000 Received: (at 30064) by debbugs.gnu.org; 10 Jan 2018 15:25:51 +0000 Received: from localhost ([127.0.0.1]:51164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eZIGD-0002xV-Ql for submit@debbugs.gnu.org; Wed, 10 Jan 2018 10:25:51 -0500 Received: from mail-wm0-f48.google.com ([74.125.82.48]:37735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eZIGB-0002xB-S4 for 30064@debbugs.gnu.org; Wed, 10 Jan 2018 10:25:48 -0500 Received: by mail-wm0-f48.google.com with SMTP id f140so27708373wmd.2 for <30064@debbugs.gnu.org>; Wed, 10 Jan 2018 07:25:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=x/XfvNONBW+KfkEZVaddP27z79C1vsWvXEQ9WAko0zc=; b=iSnabAvWm0cve8aHMKhnq7n8rbbYxXXMEu9YDr5xDqEO9c+DZdvDLtZ6HIVCU4i7EC RD/IivYjM4qiinHHkVhrKgLhUkmPZlv5Nl5/Z3h6J77qn/d6796m9yWB25owWRTRNJoc MjmoeQEdTkXbEAEEyQWfPrSQVVnv2XJSjvbeUQXkoaFCHZXkppkmHuMYnSDhFSEFD6b8 T17Pbl2BbcqFlI35e2Jhr1LpqcBaf9u1pzZsyZr5bMPUd2mVvWxnHEg2Cilnhe0GniPF 5B/4c9G5n/A4ZEbFh2Ao1MNJOxdR22tmeApwjAnxGHjbAyVadLRAkz8G8koP7pXzvheD pS0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=x/XfvNONBW+KfkEZVaddP27z79C1vsWvXEQ9WAko0zc=; b=eM5dKudO/QPAfV2WLsh1dmS9nlwsy9pfaj4W8VDTM8W0ftrkysY8xM/K6Ior7LSVH0 GaVXacVhNks/upljdJhym6yhn0vBhqAsYay66H2ZjubTMgX1jbArTrv1UBKuRWlAnltS cVkIR4+g6knxAW1R4+qV07hMmEF5CrUfKtEQHCTNOfErBEg8pz1NwtzTua7Uzq3eUM7b C7fYxtdAwCOwPp/1Lv69DkEWiZHS8HTjLHSLxPjiiI0itl8UGNvwhG7y5htbKreGktdd 17VeQqxm1vAZ/nl7hXweMSkj/tWL/MEJOgu0wryVWsJIMOP6goULjZI6u53yUxZpoGks ak/w== X-Gm-Message-State: AKGB3mKlfEX+j+2DiWhAdBTBJXxGJG9UbDKHqh06mboyR4401DLPPg3W kRdBv2DHY0T75XDF9nLTT5eRpO9P X-Google-Smtp-Source: ACJfBosW6QYMsGFixiO+/XEOtBl3+dAiyujsUOeuIgQ7f+LRiy2nY9HNvT15xGFahp9Jstv8dOKfDQ== X-Received: by 10.80.172.197 with SMTP id x63mr27132487edc.207.1515597941722; Wed, 10 Jan 2018 07:25:41 -0800 (PST) Received: from localhost ([213.233.148.28]) by smtp.gmail.com with ESMTPSA id z102sm9724228ede.29.2018.01.10.07.25.40 for <30064@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Jan 2018 07:25:40 -0800 (PST) From: "Basil L. Contovounesios" References: <871sixg59b.fsf@gmail.com> Date: Wed, 10 Jan 2018 15:25:39 +0000 In-Reply-To: <871sixg59b.fsf@gmail.com> (Basil L. Contovounesios's message of "Wed, 10 Jan 2018 14:25:36 +0000") Message-ID: <87shbdenws.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Improve-grammar-of-map-y-or-n-p-help-text-bug-30064.patch >From eddabf4a3cba46000ba04356b38e86b3616aff82 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Wed, 10 Jan 2018 13:55:29 +0000 Subject: [PATCH 1/2] Improve grammar of map-y-or-n-p help text (bug#30064) * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Do not follow a definite article with an action verb in C-h help text. --- lisp/emacs-lisp/map-ynp.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index 2a7eddedad..5aa2a6fad1 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -197,14 +197,14 @@ map-y-or-n-p (objects (if help (nth 1 help) "objects")) (action (if help (nth 2 help) "act on"))) (concat - (format-message "\ + (format-message + "\ Type SPC or `y' to %s the current %s; DEL or `n' to skip the current %s; -RET or `q' to give up on the %s (skip all remaining %s); +RET or `q' to skip the current and all remaining %s; C-g to quit (cancel the whole command); ! to %s all remaining %s;\n" - action object object action objects action - objects) + action object object objects action objects) (mapconcat (function (lambda (elt) (format "%s to %s" -- 2.15.1 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-Simplify-map-y-or-n-p-help-text-logic-bug-30064.patch >From 8d84b1bdfb2c974720cb3bff43a5114150422eca Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Wed, 10 Jan 2018 15:07:37 +0000 Subject: [PATCH 2/2] Simplify map-y-or-n-p help text logic (bug#30064) * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Use with-help-window instead of with-output-to-temp-buffer. Simplify string concatenation. --- lisp/emacs-lisp/map-ynp.el | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index 5aa2a6fad1..dd80524a15 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -191,11 +191,11 @@ map-y-or-n-p (funcall actor elt) (setq actions (1+ actions)))))) ((eq def 'help) - (with-output-to-temp-buffer "*Help*" + (with-help-window (help-buffer) (princ - (let ((object (if help (nth 0 help) "object")) - (objects (if help (nth 1 help) "objects")) - (action (if help (nth 2 help) "act on"))) + (let ((object (or (nth 0 help) "object")) + (objects (or (nth 1 help) "objects")) + (action (or (nth 2 help) "act on"))) (concat (format-message "\ @@ -205,20 +205,16 @@ map-y-or-n-p C-g to quit (cancel the whole command); ! to %s all remaining %s;\n" action object object objects action objects) - (mapconcat (function - (lambda (elt) - (format "%s to %s" - (single-key-description - (nth 0 elt)) - (nth 2 elt)))) + (mapconcat (lambda (elt) + (format "%s to %s;\n" + (single-key-description + (nth 0 elt)) + (nth 2 elt))) action-alist - ";\n") - (if action-alist ";\n") - (format "or . (period) to %s \ -the current %s and exit." - action object)))) - (with-current-buffer standard-output - (help-mode))) + "") + (format + "or . (period) to %s the current %s and exit." + action object))))) (funcall try-again)) ((and (symbolp def) (commandp def)) -- 2.15.1 --=-=-= Content-Type: text/plain I was able to make some minor improvements/simplifications to the logic surrounding my last patch. I attach a patch to this effect, along with a reworded version of the original patch to include the assigned bug ticket number. Thanks, -- Basil --=-=-=-- From unknown Sun Jun 22 17:17:59 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: "Basil L. Contovounesios" Subject: bug#30064: closed (Re: bug#30064: 27.0.50; Improve grammar of map-y-or-n-p help text) Message-ID: References: <83tvvgsony.fsf@gnu.org> <871sixg59b.fsf@gmail.com> X-Gnu-PR-Message: they-closed 30064 X-Gnu-PR-Package: emacs Reply-To: 30064@debbugs.gnu.org Date: Sat, 20 Jan 2018 12:26:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1516451162-5304-1" This is a multi-part message in MIME format... ------------=_1516451162-5304-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #30064: 27.0.50; Improve grammar of map-y-or-n-p help text which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 30064@debbugs.gnu.org. --=20 30064: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D30064 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1516451162-5304-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 30064-done) by debbugs.gnu.org; 20 Jan 2018 12:25:35 +0000 Received: from localhost ([127.0.0.1]:35645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ecsDH-0001Mu-B2 for submit@debbugs.gnu.org; Sat, 20 Jan 2018 07:25:35 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ecsDE-0001Md-Pz for 30064-done@debbugs.gnu.org; Sat, 20 Jan 2018 07:25:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecsD6-0008SA-Em for 30064-done@debbugs.gnu.org; Sat, 20 Jan 2018 07:25:27 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:51356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecsD6-0008S3-9h; Sat, 20 Jan 2018 07:25:24 -0500 Received: from [176.228.60.248] (port=3712 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ecsD5-0007dS-JT; Sat, 20 Jan 2018 07:25:24 -0500 Date: Sat, 20 Jan 2018 14:25:05 +0200 Message-Id: <83tvvgsony.fsf@gnu.org> From: Eli Zaretskii To: "Basil L. Contovounesios" In-reply-to: <87shbdenws.fsf@gmail.com> (contovob@tcd.ie) Subject: Re: bug#30064: 27.0.50; Improve grammar of map-y-or-n-p help text References: <871sixg59b.fsf@gmail.com> <87shbdenws.fsf@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 30064-done Cc: 30064-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Eli Zaretskii Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) > From: "Basil L. Contovounesios" > Date: Wed, 10 Jan 2018 15:25:39 +0000 > > I was able to make some minor improvements/simplifications to the logic > surrounding my last patch. I attach a patch to this effect, along with > a reworded version of the original patch to include the assigned bug > ticket number. Thanks, pushed to the master branch. ------------=_1516451162-5304-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 10 Jan 2018 14:26:00 +0000 Received: from localhost ([127.0.0.1]:50375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eZHKK-0007t8-K5 for submit@debbugs.gnu.org; Wed, 10 Jan 2018 09:26:00 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eZHKI-0007sv-Lo for submit@debbugs.gnu.org; Wed, 10 Jan 2018 09:25:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZHKC-0000r7-5G for submit@debbugs.gnu.org; Wed, 10 Jan 2018 09:25:53 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35948) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZHKC-0000qp-2G for submit@debbugs.gnu.org; Wed, 10 Jan 2018 09:25:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZHK7-0003wa-O3 for bug-gnu-emacs@gnu.org; Wed, 10 Jan 2018 09:25:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZHK4-0000mc-KQ for bug-gnu-emacs@gnu.org; Wed, 10 Jan 2018 09:25:47 -0500 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:34115) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZHK4-0000lL-Ct for bug-gnu-emacs@gnu.org; Wed, 10 Jan 2018 09:25:44 -0500 Received: by mail-wm0-x22a.google.com with SMTP id 81so2100568wmb.1 for ; Wed, 10 Jan 2018 06:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=QeQQHEDL49EqtLKsPTJQu8rlYBPPKWpiIS2iaoe/M+Y=; b=VhYPWzVwyQWdep0aM22Nmc8oMo0m7/sB05obVjPmAyIyy/Tu5LjszoUHtnXFnFT+2e QBwjyO6ZEWOkMXkK79MSw2YyjTYp0y9BTDlxMLn5Ve+O96nZb1W8Ef+Xl7sC+/2t6ga5 O/ykbr46K+KgDycjB9R+GL0fXltxmkHfukhwMMfQ2y2DV0pxDH1JSFG6cXiZzMfNLpeM A+pV54LqNPe3+xJF1+D2EmbARr9HEDthBg+doboLBCO+AdehTVRq8ZSiLODoTWs2A4ig M5rm2wVYGJpcZhMQVw3+DOyXJEnz/aZDAS+Vq9SIDFhIkhkDm9TiTb2BmqybgCklpNEr 6aTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=QeQQHEDL49EqtLKsPTJQu8rlYBPPKWpiIS2iaoe/M+Y=; b=OUJ/k+CF8FwaQgtXjVv9fU6oVAM3jmAr2QrGEG4sxUR/DnkN3ElljY9HJuq1YQMJ8D T2FBRO9l5Y3yVfjJhAiq+LX1WKej7GFJWH7AQPzz3fPSzv0s4mqnU8k1sIYe1Ymwomco eD8ju1QHXEI2m2M079tnqSrfXf9/ic+N7NIZ8oOuxDZTKPf430tTDrkFS+jk/QC4WcAA /IUr5rppfHbCWJSe5is3bwJqdWphbKadcPDhhcrf4Udszo0+b4vrtzZhOWzYP+hKwcv4 PZTdJ1Oh8Bg13lo7IxH6RJGfcNeuWhtq+zQbwaD/c794/gl1eAZejxbnnZgbz1g/RlFu m6QQ== X-Gm-Message-State: AKwxytcn1gBQSPhZQFnPJCQk6rGD/6zpH2Lv3kEf8zgbJpF1kCMHecDJ uVxg1TMZbIGn9HkydTMN6nsMkh0k X-Google-Smtp-Source: ACJfBotEBDz6pXZxNy9i6IqbPWVj0ZlIVIUke4APDbSowfflDFqzmpmPa+qoSOHW5ViN7+x5E2trUw== X-Received: by 10.80.182.181 with SMTP id d50mr1920539ede.116.1515594342622; Wed, 10 Jan 2018 06:25:42 -0800 (PST) Received: from localhost ([213.233.148.28]) by smtp.gmail.com with ESMTPSA id 4sm9246954edf.81.2018.01.10.06.25.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Jan 2018 06:25:41 -0800 (PST) From: "Basil L. Contovounesios" To: bug-gnu-emacs@gnu.org Subject: 27.0.50; Improve grammar of map-y-or-n-p help text Date: Wed, 10 Jan 2018 14:25:36 +0000 Message-ID: <871sixg59b.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Improve-grammar-of-map-y-or-n-p-help-text.patch >From c846d0f52a398e97f0cf705c2ae17a93629e2e66 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Wed, 10 Jan 2018 13:55:29 +0000 Subject: [PATCH] Improve grammar of map-y-or-n-p help text * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Do not follow a definite article with an action verb in C-h help text. --- lisp/emacs-lisp/map-ynp.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index 2a7eddedad..5aa2a6fad1 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -197,14 +197,14 @@ map-y-or-n-p (objects (if help (nth 1 help) "objects")) (action (if help (nth 2 help) "act on"))) (concat - (format-message "\ + (format-message + "\ Type SPC or `y' to %s the current %s; DEL or `n' to skip the current %s; -RET or `q' to give up on the %s (skip all remaining %s); +RET or `q' to skip the current and all remaining %s; C-g to quit (cancel the whole command); ! to %s all remaining %s;\n" - action object object action objects action - objects) + action object object objects action objects) (mapconcat (function (lambda (elt) (format "%s to %s" -- 2.15.1 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable The help text displayed by the function map-y-or-n-p when the user types C-h contains the following grammatically dubious phrase: RET or =E2=80=98q=E2=80=99 to give up on the act on (skip all remaining o= bjects); ^^^^^^^^^^ where an (configurable) action verb follows the definite article. I attach a patch to both avoid this and clarify that the current object is skipped as well as all remaining ones. Thanks, --=20 Basil In GNU Emacs 27.0.50 (build 13, x86_64-pc-linux-gnu, X toolkit, Xaw3d scrol= l bars) of 2018-01-03 built on thunk Repository revision: f8b4e87d5d4f57954b50677add76ce5136211dc1 Windowing system distributor 'The X.Org Foundation', version 11.0.11905000 System Description: Debian GNU/Linux testing (buster) --=-=-=-- ------------=_1516451162-5304-1--