diff options
Diffstat (limited to 'user/emacs')
| -rw-r--r-- | user/emacs/init.el | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el index c9482b3f..2f23f924 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -397,9 +397,7 @@ _p_rev _u_pper _=_: upper/lower _r_esolve (setq evil-collection-magit-use-y-for-yank nil) (general-unbind 'normal magit-mode-map "<escape>") - (evil-collection-init) - (with-eval-after-load 'company - (company-tng-mode t)))) + (evil-collection-init))) (general-create-definer my-leader-def :keymaps 'override @@ -518,11 +516,7 @@ _p_rev _u_pper _=_: upper/lower _r_esolve company-begin-commands '(self-insert-command) company-insertion-on-trigger #'company-explicit-action-p company-insertion-triggers '(?\ ?\( ?\) ?.)) - (global-company-mode +1) - (general-unbind company-active-map - "C-j" - "RET" - [return])) + (global-company-mode +1)) :general (:states 'insert "TAB" #'company-indent-or-complete-common @@ -530,6 +524,7 @@ _p_rev _u_pper _=_: upper/lower _r_esolve (:keymaps 'company-active-map "TAB" #'company-complete-common-or-cycle "<tab>" #'company-complete-common-or-cycle + "C-j" nil "<M-tab>" #'company-other-backend "<C-tab>" #'company-other-backend "S-TAB" #'company-select-previous |