From e6519af6c9665eb912384cdd7a88937e618cad41 Mon Sep 17 00:00:00 2001 From: jao Date: Sat, 4 Jun 2022 19:05:54 +0100 Subject: completion: orderless only in the minibuffer --- completion.org | 29 +++++++++++++++++------------ notmuch.org | 4 +--- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/completion.org b/completion.org index fe1a382..3a4049a 100644 --- a/completion.org +++ b/completion.org @@ -82,18 +82,23 @@ (use-package orderless :ensure t :init - (setq completion-styles '(substring partial-completion orderless)) :config (orderless-define-completion-style orderless+initialism (orderless-matching-styles '(orderless-initialism orderless-prefixes orderless-literal orderless-regexp))) - (setq completion-category-overrides - '((file (styles partial-completion orderless)) - (command (styles orderless+initialism))) - orderless-matching-styles - '(orderless-literal orderless-regexp orderless-prefixes))) + + (defun jao-orderless--set-locally () + (setq-local completion-styles + '(substring partial-completion orderless) + + completion-category-overrides + '((file (styles partial-completion orderless)) + (command (styles orderless+initialism))) + orderless-matching-styles + '(orderless-literal orderless-regexp orderless-prefixes))) + (add-hook 'minibuffer-setup-hook #'jao-orderless--set-locally)) #+end_src * marginalia @@ -179,12 +184,12 @@ :config - (setq completion-in-region-function - (lambda (&rest args) - (apply (if (and (not window-system) vertico-mode) - #'consult-completion-in-region - #'completion--in-region) - args))) + ;; (setq completion-in-region-function + ;; (lambda (&rest args) + ;; (apply (if (and (not window-system) vertico-mode) + ;; #'consult-completion-in-region + ;; #'completion--in-region) + ;; args))) (defun jao-vertico--display-candidates (lines) (move-overlay vertico--candidates-ov (point-min) (point-min)) diff --git a/notmuch.org b/notmuch.org index cdcb76f..b9edb29 100644 --- a/notmuch.org +++ b/notmuch.org @@ -492,9 +492,7 @@ notmuch-tree-thread-symbols '((prefix . " ") (top . " ") (top-tee . " ") (vertical . " ") (vertical-tee . " ") (bottom . " ") - (arrow . "")) - ) - + (arrow . ""))) :config (jao-notmuch-adjust-tree-fonts -- cgit v1.2.3