branch: externals/orderless
commit 44935d8962be5724d8a3a4358ce0a4222450ee26
Author: Omar Antolín <[email protected]>
Commit: Omar Antolín <[email protected]>
Fix bug when all matching styles return nil
---
orderless.el | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/orderless.el b/orderless.el
index 921fa0931c..ce34d497c4 100644
--- a/orderless.el
+++ b/orderless.el
@@ -391,15 +391,11 @@ compilers."
for component in components and index from 0
for (newstyles . newcomp) = (orderless-dispatch
dispatchers styles component index total)
- collect
- (if (functionp newstyles)
- (funcall newstyles newcomp)
- (rx-to-string
- `(or
- ,@(cl-loop for style in newstyles
- for result = (funcall style newcomp)
- if result
- collect `(regexp ,result)))))))
+ when (functionp newstyles) do (setq newstyles (list newstyles))
+ for regexps = (cl-loop for style in newstyles
+ for result = (funcall style newcomp)
+ when result collect `(regexp ,result))
+ when regexps collect (rx-to-string `(or ,@regexps))))
;;; Completion style implementation
