From: Gregory Heytings <gregory@heytings.org>
Date: Thu, 29 Dec 2022 21:50:26 +0000 (+0000)
Subject: Fix completion when completion-auto-select is set
X-Git-Tag: emacs-29.0.90~918
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=beed746f944aba2559192c057ea294233876e99d;p=emacs.git

Fix completion when completion-auto-select is set

* lisp/minibuffer.el (completion--do-completion): Do not display
"Complete, but not unique" messages when completion-auto-select is
set.  Fixes bug#60359.
---

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 6e42296e7ba..7a720cf2c0a 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1474,7 +1474,10 @@ when the buffer's text is already an exact match."
               (if (and (eq this-command last-command) completion-auto-help)
                   (minibuffer-completion-help beg end))
               (completion--done completion 'exact
-                                (unless expect-exact
+                                (unless (or expect-exact
+                                            (and completion-auto-select
+                                                 (eq this-command last-command)
+                                                 completion-auto-help))
                                   "Complete, but not unique"))))
 
             (minibuffer--bitset completed t exact))))))))