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#68689: 30.0.50; minibuffer-visible-completions should change completion-show-help Date: Wed, 24 Jan 2024 11:11:16 -0500 Message-ID: References: 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="7513"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: 68689@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jan 24 17:12:13 2024 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 1rSfrJ-0001jo-4W for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 24 Jan 2024 17:12:13 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSfr5-0005Vl-5h; Wed, 24 Jan 2024 11:11:59 -0500 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 1rSfr3-0005Ra-EH for bug-gnu-emacs@gnu.org; Wed, 24 Jan 2024 11:11:57 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSfr3-00062v-5c for bug-gnu-emacs@gnu.org; Wed, 24 Jan 2024 11:11:57 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSfr8-0001H4-5c for bug-gnu-emacs@gnu.org; Wed, 24 Jan 2024 11:12:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Spencer Baugh Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Jan 2024 16:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68689 X-GNU-PR-Package: emacs Original-Received: via spool by 68689-submit@debbugs.gnu.org id=B68689.17061126894838 (code B ref 68689); Wed, 24 Jan 2024 16:12:02 +0000 Original-Received: (at 68689) by debbugs.gnu.org; 24 Jan 2024 16:11:29 +0000 Original-Received: from localhost ([127.0.0.1]:46362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSfqa-0001Fw-SN for submit@debbugs.gnu.org; Wed, 24 Jan 2024 11:11:29 -0500 Original-Received: from mxout5.mail.janestreet.com ([64.215.233.18]:38229) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSfqY-0001Fg-L6 for 68689@debbugs.gnu.org; Wed, 24 Jan 2024 11:11:27 -0500 In-Reply-To: (Spencer Baugh's message of "Wed, 24 Jan 2024 11:09:08 -0500") DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=janestreet.com; s=waixah; t=1706112676; bh=aMIVWqoRjRAwEV9+sUZgKXIzW+v9HtJE3WANPmIe6aM=; h=From:To:Subject:In-Reply-To:References:Date; b=e5igTIKTs7RTYfPSnwsJjb8IZCVRzktiTXt7Pm1BuwlBBqqJdaOxcMKU4LTW9eCn/ wpqosUN42cy2PE/M6B1iUTLiRFnTT3JlDRt7SON6o5u9QdbX6Ll3jKTLXjQ5gUrpMH FQxPN34150/DfUH5jFUrvHthuVrbJHM5OtMeYIhwdLhuA4v7b0xgHe50XXfzZ8px76 XiS4xyv55MOXVixvVCSqPZ3P3QY6taLfdCD7CcJmFG/LzvTOPsbsYxLvQubOJPJluT +KDJYDJ/ZykRZ7p03Fdk8MJz/t4B1lS/YN8U+MPcGgwrvvoykmrzaPuotIrqjB400A NyqtVR70peV0Q== 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:278793 Archived-At: --=-=-= Content-Type: text/plain Patch to fix --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Update-minibuffer-show-help-based-on-minibuffer-visi.patch >From c70736c52262cacb905ed1e564b2335a3c87f5b4 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Wed, 24 Jan 2024 11:10:40 -0500 Subject: [PATCH] Update minibuffer-show-help based on minibuffer-visible-completions minibuffer-visible-completions makes some more convenient bindings available, but the help shown by minibuffer-show-help wasn't suggesting them. Now it is. * lisp/simple.el (completion-setup-function): Change help text when minibuffer-visible-completions is non-nil. (bug#68689) --- lisp/simple.el | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index 35fd76b8d1a..23019dd1138 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -10232,13 +10232,27 @@ completion-setup-function ;; Maybe insert help string. (when completion-show-help (goto-char (point-min)) - (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")))))) + (if minibuffer-visible-completions + (let ((helps + (with-current-buffer (window-buffer (active-minibuffer-window)) + (list + (substitute-command-keys + (if (display-mouse-p) + "Click or type \\[minibuffer-choose-completion-or-exit] on a completion to select it.\n" + "Type \\[minibuffer-choose-completion-or-exit] on a completion to select it.\n")) + (substitute-command-keys + "Type \\[minibuffer-next-completion], \\[minibuffer-previous-completion], \ +\\[minibuffer-next-line-completion], \\[minibuffer-previous-line-completion] \ +to move point between completions.\n\n"))))) + (dolist (help helps) + (insert help))) + (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 --=-=-=--