From d760474e1d0addfadabb307c86af36158791e10c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 16 Feb 2021 19:37:40 -0600 Subject: [PATCH] fix(selectrum): Move orderless/selectrum config... to be only under `use-package! orderless` --- modules/completion/selectrum/config.el | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/completion/selectrum/config.el b/modules/completion/selectrum/config.el index a8c5b8608..f51312e6c 100644 --- a/modules/completion/selectrum/config.el +++ b/modules/completion/selectrum/config.el @@ -7,13 +7,8 @@ selectrum-num-candidates-displayed 15 selectrum-extend-current-candidate-highlight t selectrum-fix-minibuffer-height t) - (when (featurep! +orderless) - - (setq completion-styles '(substring partial-completion) - selectrum-refine-candidates-function #'orderless-filter - selectrum-highlight-candidates-function #'orderless-highlight-matches)) - - + (unless (featurep! +orderless) + (setq completion-styles '(substring partial-completion))) :config (defadvice! +selectrum-refresh-on-cycle (&rest _) :after 'marginalia-cycle @@ -50,7 +45,8 @@ :config (setq completion-styles '(orderless)) (setq orderless-skip-highlighting (lambda () selectrum-active-p)) - (setq selectrum-highlight-candidates-function #'orderless-highlight-matches)) + (setq selectrum-highlight-candidates-function #'orderless-highlight-matches + selectrum-refine-candidates-function #'orderless-filter)) (use-package! consult :defer t