From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Spencer Baugh Newsgroups: gmane.emacs.bugs Subject: bug#64425: [PATCH] Mention minibuffer-next-completion in completion-help Date: Mon, 03 Jul 2023 10:00:01 -0400 Message-ID: References: <4beb74b6-6bbc-4e0f-9b95-f95b7edf79b9@email.android.com> <83o7ktm8er.fsf@gnu.org> <83mt0dm7p5.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="551"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: sbaugh@catern.com, 64425@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jul 03 16:01:24 2023 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 1qGK7I-000AVJ-0U for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 03 Jul 2023 16:01:24 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGK6x-0005DT-M7; Mon, 03 Jul 2023 10:01:03 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGK6w-0005DL-UE for bug-gnu-emacs@gnu.org; Mon, 03 Jul 2023 10:01:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGK6w-0002Pb-Lf for bug-gnu-emacs@gnu.org; Mon, 03 Jul 2023 10:01:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGK6w-0002Ib-2O for bug-gnu-emacs@gnu.org; Mon, 03 Jul 2023 10:01:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Spencer Baugh Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 03 Jul 2023 14:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64425 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64425-submit@debbugs.gnu.org id=B64425.16883928168773 (code B ref 64425); Mon, 03 Jul 2023 14:01:02 +0000 Original-Received: (at 64425) by debbugs.gnu.org; 3 Jul 2023 14:00:16 +0000 Original-Received: from localhost ([127.0.0.1]:34236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGK68-0002HO-Oi for submit@debbugs.gnu.org; Mon, 03 Jul 2023 10:00:16 -0400 Original-Received: from mxout6.mail.janestreet.com ([64.215.233.21]:43893) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGK63-0002FX-Dn for 64425@debbugs.gnu.org; Mon, 03 Jul 2023 10:00:11 -0400 In-Reply-To: <83mt0dm7p5.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 03 Jul 2023 16:43:34 +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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:264530 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Spencer Baugh >> Date: Mon, 3 Jul 2023 09:31:11 -0400 >> Cc: Spencer Baugh , 64425@debbugs.gnu.org >> >> On Mon, Jul 3, 2023, 09:27 Eli Zaretskii wrote: >> >> > Date: Mon, 03 Jul 2023 13:19:27 +0000 (UTC) >> > From: Spencer Baugh >> > Cc: Spencer Baugh , 64425@debbugs.gnu.org >> > >> > > diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi >> > > index 9bf4da67644..517a6262522 100644 >> > > --- a/doc/emacs/mini.texi >> > > +++ b/doc/emacs/mini.texi >> > > @@ -393,7 +393,7 @@ Completion Commands >> > > @vindex minibuffer-completion-auto-choose >> > > @item M-@key{DOWN} >> > > @itemx M-@key{UP} >> > > -While in the minibuffer, these keys navigate through the completions >> > > +These keys navigate through the completions >> > >> > I don't understand this change: do you mean that these keys are >> > available not only in the minibuffer? >> > >> > Yes, my change adds bindings for them also in the completions buffer. So they can be used >> identically >> > in both places. >> >> Then the manual should say "in the minibuffer and in the completions >> buffer >> >> They are also available in regular buffers after triggering completion-at-point. Should we note that too? > > Yes, but in another place, where completion-at-point is documented. OK, fair enough. Actually, that part is already done, in (info "(emacs) Symbol Completion"). So revised patch updating the minibuffer completion documentation: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Mention-minibuffer-next-completion-in-completion-hel.patch >From 7c6bc1fc940252b65f2d63c98ff2d53f02699091 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Mon, 3 Jul 2023 09:59:04 -0400 Subject: [PATCH] Mention minibuffer-next-completion in completion-help Now that it's not necessary to switch to the *Completions* buffer to switch between and choose completions, we should make that clear in the help text. Let's also make the bindings uniform both in and outside the *Completions* buffer so users don't have to think about the difference. In working with new users, they've assumed that since the help text in *Completions* says "Click on a completion to select it", that that's the only way to select a completion. This text should help clarify that. * doc/emacs/mini.texi (Completion Commands): Document new bindings. * lisp/simple.el (completion-list-mode-map): Bind minibuffer-{next,previous,choose}-completion. (completion-setup-function): Mention bindings for minibuffer-{next,previous,choose}-completion. (Bug#64425) --- doc/emacs/mini.texi | 12 ++++++------ lisp/simple.el | 15 ++++++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 9bf4da67644..8281c8cb9d4 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -393,11 +393,11 @@ Completion Commands @vindex minibuffer-completion-auto-choose @item M-@key{DOWN} @itemx M-@key{UP} -While in the minibuffer, these keys navigate through the completions -displayed in the completions buffer. When -@code{minibuffer-completion-auto-choose} is non-@code{nil} (which is -the default), using these commands also inserts the current completion -candidate into the minibuffer. If +While in the minibuffer or in the completion list buffer, these keys +navigate through the completions displayed in the completion list +buffer. When @code{minibuffer-completion-auto-choose} is +non-@code{nil} (which is the default), using these commands also +inserts the current completion candidate into the minibuffer. If @code{minibuffer-completion-auto-choose} is @code{nil}, you can use the @kbd{M-@key{RET}} command to insert the completion candidates into the minibuffer. By default, that exits the minibuffer, but with a @@ -410,7 +410,7 @@ Completion Commands @itemx @key{prior} Typing @kbd{M-v}, while in the minibuffer, selects the window showing the completion list (@code{switch-to-completions}). This paves the -way for using the commands below. @key{PageUp}, @key{prior} and +way for also using the commands below. @key{PageUp}, @key{prior} and @kbd{M-g M-c} does the same. You can also select the window in other ways (@pxref{Windows}). diff --git a/lisp/simple.el b/lisp/simple.el index b6efb06fc27..3513bb82293 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -9670,6 +9670,9 @@ completion-list-mode-map (define-key map [right] 'next-completion) (define-key map [?\t] 'next-completion) (define-key map [backtab] 'previous-completion) + (define-key map (kbd "M-") 'minibuffer-previous-completion) + (define-key map (kbd "M-") 'minibuffer-next-completion) + (define-key map (kbd "M-RET") 'minibuffer-choose-completion) (define-key map "z" 'kill-current-buffer) (define-key map "n" 'next-completion) (define-key map "p" 'previous-completion) @@ -10064,11 +10067,13 @@ completion-setup-function ;; Maybe insert help string. (when completion-show-help (goto-char (point-min)) - (if (display-mouse-p) - (insert "Click on a completion to select it.\n")) - (insert (substitute-command-keys - "In this buffer, type \\[choose-completion] to \ -select the completion near point.\n\n")))))) + (insert (substitute-command-keys + (if (display-mouse-p) + "Click or type \\[minibuffer-choose-completion] on a completion to select it.\n" + "Type \\[minibuffer-choose-completion] on a completion to select it.\n"))) + (insert (substitute-command-keys + "Type \\[minibuffer-next-completion] or \\[minibuffer-previous-completion] \ +to move point between completions.\n\n")))))) (add-hook 'completion-setup-hook #'completion-setup-function) -- 2.39.3 --=-=-=--