branch: externals/ivy-hydra
commit 9e7f21a7ae583adf8d81c405f08ca0bd13110a57
Author: Spenser Truex <[email protected]>
Commit: Oleh Krehel <[email protected]>
ivy.el (ivy-completing-read): Fix require-match arg being symbol
Do not cast them into boolean T values, since they change behaviour.
Fixes #2367
---
ivy.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ivy.el b/ivy.el
index ede57d3..5b5f165 100644
--- a/ivy.el
+++ b/ivy.el
@@ -2413,7 +2413,7 @@ This interface conforms to `completing-read' and can be
used for
PROMPT is a string that normally ends in a colon and a space.
COLLECTION is either a list of strings, an alist, an obarray, or a hash table.
PREDICATE limits completion to a subset of COLLECTION.
-REQUIRE-MATCH is a boolean value. See `completing-read'.
+REQUIRE-MATCH is a boolean value or a symbol. See `completing-read'.
INITIAL-INPUT is a string inserted into the minibuffer initially.
HISTORY is a list of previously selected inputs.
DEF is the default value.
@@ -2440,7 +2440,8 @@ INHERIT-INPUT-METHOD is currently ignored."
(let ((str (ivy-read
prompt collection
:predicate predicate
- :require-match (and collection require-match)
+ :require-match (when (and collection require-match)
+ require-match)
:initial-input (cond ((consp initial-input)
(car initial-input))
((and (stringp initial-input)