fix(selectrum): Move orderless/selectrum config...

to be only under `use-package! orderless`
This commit is contained in:
Edmund Miller 2021-02-16 19:37:40 -06:00 committed by Itai Y. Efrat
parent 3afb712452
commit d760474e1d

View file

@ -7,13 +7,8 @@
selectrum-num-candidates-displayed 15 selectrum-num-candidates-displayed 15
selectrum-extend-current-candidate-highlight t selectrum-extend-current-candidate-highlight t
selectrum-fix-minibuffer-height t) selectrum-fix-minibuffer-height t)
(when (featurep! +orderless) (unless (featurep! +orderless)
(setq completion-styles '(substring partial-completion)))
(setq completion-styles '(substring partial-completion)
selectrum-refine-candidates-function #'orderless-filter
selectrum-highlight-candidates-function #'orderless-highlight-matches))
:config :config
(defadvice! +selectrum-refresh-on-cycle (&rest _) (defadvice! +selectrum-refresh-on-cycle (&rest _)
:after 'marginalia-cycle :after 'marginalia-cycle
@ -50,7 +45,8 @@
:config :config
(setq completion-styles '(orderless)) (setq completion-styles '(orderless))
(setq orderless-skip-highlighting (lambda () selectrum-active-p)) (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 (use-package! consult
:defer t :defer t