summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-04-20 14:24:23 -0500
committerCase Duckworth2021-04-20 14:27:22 -0500
commit4a9252b1144b548703df4c1c51141e38284b2381 (patch)
treeb68fe98e55f9a88d0a1e8e3362bcc23f60813781
parentCorrect things (diff)
downloademacs-4a9252b1144b548703df4c1c51141e38284b2381.tar.gz
emacs-4a9252b1144b548703df4c1c51141e38284b2381.zip
Use company for completion-in-region instead of corfu
I found out it does completion-in-region, and honestly, it's a better
interface, and more uniform.
-rw-r--r--init.el20
1 files changed, 7 insertions, 13 deletions
diff --git a/init.el b/init.el index 4cef620..6627a82 100644 --- a/init.el +++ b/init.el
@@ -691,7 +691,13 @@ if ripgrep is installed, otherwise `consult-grep'."
691 xref-show-definitions-function #'consult-xref) 691 xref-show-definitions-function #'consult-xref)
692 692
693 ;; Projects 693 ;; Projects
694 (:option consult-project-root-function #'vc-root-dir)) 694 (:option consult-project-root-function #'vc-root-dir)
695
696 ;; Competion-at-point (complete-region)
697 (:global "M-/" completion-at-point)
698 (:option completion-in-region-function #'consult-completion-in-region
699 completion-cycle-threshold 3
700 tab-always-indent 'complete))
695 701
696(setup (:straight marginalia) 702(setup (:straight marginalia)
697 (:option marginalia-annotators '(marginalia-annotators-heavy 703 (:option marginalia-annotators '(marginalia-annotators-heavy
@@ -779,18 +785,6 @@ if ripgrep is installed, otherwise `consult-grep'."
779 (apheleia--get-formatter-command))) 785 (apheleia--get-formatter-command)))
780 (indent-region (point-min) (point-max))))) 786 (indent-region (point-min) (point-max)))))
781 787
782(setup (:straight (corfu
783 :host github
784 :repo "minad/corfu"))
785 (:option completion-cycle-threshold 3
786 tab-always-indent 'complete
787 corfu-cycle t)
788 (:with-map corfu-map
789 (:bind "TAB" corfu-next
790 "S-TAB" corfu-previous))
791 (:hook-into prog-mode
792 eshell-mode))
793
794;;; Lisps 788;;; Lisps
795(defvar lispy-modes '(emacs-lisp-mode 789(defvar lispy-modes '(emacs-lisp-mode
796 eval-expression-minibuffer 790 eval-expression-minibuffer