From: Joseph Turner <joseph@breatheoutbreathe.in>
Date: Sun, 12 Nov 2023 21:21:50 +0000 (-0800)
Subject: Fix completing-read functional REQUIRE-MATCH behavior
X-Git-Tag: archive/raspbian/1%29.4+1-4+rpi1~1^2~2^2~18^2~81
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=77f5d4d523a406650036b7cd0d872d39a114a9ac;p=emacs.git

Fix completing-read functional REQUIRE-MATCH behavior

* lisp/minibuffer.el (completion--complete-and-exit): If
minibuffer-completion-confirm is a function which returns nil,
immediately fail to complete.

See bug#66187.
---

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 3c4315b87fc..faa7f543ece 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1847,10 +1847,13 @@ appear to be a match."
    ;; Allow user to specify null string
    ((= beg end) (funcall exit-function))
    ;; The CONFIRM argument is a predicate.
-   ((and (functionp minibuffer-completion-confirm)
-         (funcall minibuffer-completion-confirm
-                  (buffer-substring beg end)))
-    (funcall exit-function))
+   ((functionp minibuffer-completion-confirm)
+    (if (funcall minibuffer-completion-confirm
+                 (buffer-substring beg end))
+        (funcall exit-function)
+      (unless completion-fail-discreetly
+	(ding)
+	(completion--message "No match"))))
    ;; See if we have a completion from the table.
    ((test-completion (buffer-substring beg end)
                      minibuffer-completion-table