[elpa] externals/vertico 35b4b4884a 1/2: vertico--match-p: Minor cleanup

[ELPA Syncer]

branch: externals/vertico
commit 35b4b4884a5058b5efe5a0f89e3eb87c892151dc
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    vertico--match-p: Minor cleanup
---
 vertico.el | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/vertico.el b/vertico.el
index 4ddffdded9..647b57c8a2 100644
--- a/vertico.el
+++ b/vertico.el
@@ -556,14 +556,13 @@ The function is configured by BY, BSIZE, BINDEX, BPRED 
and PRED."
 
 (defun vertico--match-p (input)
   "Return t if INPUT is a valid match."
-  (or (memq minibuffer--require-match '(nil confirm-after-completion))
-      (equal "" input) ;; Null completion, returns default value
-      (and (functionp minibuffer--require-match) ;; Emacs 29 require-match 
function
-           (funcall minibuffer--require-match input))
-      (test-completion input minibuffer-completion-table 
minibuffer-completion-predicate)
-      (if (eq minibuffer--require-match 'confirm)
-          (eq (ignore-errors (read-char "Confirm")) 13)
-        (and (minibuffer-message "Match required") nil))))
+  (let ((rm minibuffer--require-match))
+    (or (memq rm '(nil confirm-after-completion))
+        (equal "" input) ;; Null completion, returns default value
+        (and (functionp rm) (funcall rm input)) ;; Emacs 29 supports functions
+        (test-completion input minibuffer-completion-table 
minibuffer-completion-predicate)
+        (if (eq rm 'confirm) (eq (ignore-errors (read-char "Confirm")) 13)
+          (minibuffer-message "Match required") nil))))
 
 (cl-defgeneric vertico--format-candidate (cand prefix suffix index _start)
   "Format CAND given PREFIX, SUFFIX and INDEX."