about summary refs log tree commit diff stats
path: root/.emacs.d/lisp/init-completion.el
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/lisp/init-completion.el')
-rw-r--r--.emacs.d/lisp/init-completion.el21
1 files changed, 8 insertions, 13 deletions
diff --git a/.emacs.d/lisp/init-completion.el b/.emacs.d/lisp/init-completion.el
index 36a5680..16eca6b 100644
--- a/.emacs.d/lisp/init-completion.el
+++ b/.emacs.d/lisp/init-completion.el
@@ -14,17 +14,10 @@
           (list '+elpaca-unload-dabbrev 'elpaca--activate-package)))
 
 (use-feature dabbrev
-  ;; Load newer version until 30.1 is released
-  ;; https://mail.gnu.org/archive/html/bug-gnu-emacs/2024-05/msg00422.html
-  ;; Relies on the fact that the emacs repo is checked out to elpaca/repos/project
-  :ensure `(dabbrev :build ,(+elpaca-dabbrev-build-steps) :repo "~/.emacs.d/elpaca/repos/project/" :files ("lisp/dabbrev.el"))
   :custom
   (dabbrev-case-distinction nil)
   (dabbrev-case-fold-search t)
-  (dabbrev-case-replace nil)
-  ;; TODO remove this after 30.1
-  :bind
-  ("C-M-/" . hippie-expand))
+  (dabbrev-case-replace nil))
 
 (use-package mono-complete
   :config
@@ -83,10 +76,6 @@
   (orderless-component-separator 'orderless-escapable-split-on-space)
   (completion-styles '(orderless partial-completion basic))
   (completion-category-defaults nil)
-  (completion-category-overrides '((file (styles partial-completion orderless))
-                                   (command (styles +orderless-with-strict-leading-initialism))
-                                   (variable (styles +orderless-with-strict-leading-initialism))
-                                   (symbol (styles +orderless-with-strict-leading-initialism))))
   (orderless-matching-styles '(orderless-literal orderless-regexp orderless-strict-initialism))
   (orderless-style-dispatchers (list #'+orderless-consult-dispatch
                                      #'orderless-affix-dispatch))
@@ -127,6 +116,7 @@ candidate, in that order, at the beginning of words, with
 no words in between, beginning with the first word."
     (orderless-strict-initialism component t))
 
+  ;; Replace initialism (,) with strict-leading-initialism, and also add strict initialism
   (setf (alist-get ?, orderless-affix-dispatch-alist) #'orderless-strict-leading-initialism)
   (add-to-list 'orderless-affix-dispatch-alist '(?` . orderless-strict-initialism) t)
 
@@ -156,7 +146,12 @@ no words in between, beginning with the first word."
 
   ;; Based on https://github.com/minad/consult/wiki#minads-orderless-configuration
   (orderless-define-completion-style +orderless-with-strict-leading-initialism
-    (orderless-matching-styles '(orderless-literal orderless-regexp orderless-strict-leading-initialism))))
+    (orderless-matching-styles '(orderless-literal orderless-regexp orderless-strict-leading-initialism)))
+
+  (setopt completion-category-overrides '((file (styles partial-completion orderless))
+                                          (command (styles +orderless-with-strict-leading-initialism))
+                                          (variable (styles +orderless-with-strict-leading-initialism))
+                                          (symbol (styles +orderless-with-strict-leading-initialism)))))
 
 ;; code completion - corfu
 (use-package corfu