From 44935d8962be5724d8a3a4358ce0a4222450ee26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Omar=20Antol=C3=ADn?= Date: Tue, 23 Mar 2021 17:41:13 -0600 Subject: 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 921fa09..ce34d49 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 -- cgit v1.0