summary refs log tree commit diff stats
path: root/user/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'user/emacs')
-rw-r--r--user/emacs/.emacs.d/init.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/user/emacs/.emacs.d/init.el b/user/emacs/.emacs.d/init.el
index a01be536..e7f06c40 100644
--- a/user/emacs/.emacs.d/init.el
+++ b/user/emacs/.emacs.d/init.el
@@ -288,7 +288,7 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
   (:states '(normal motion)
            "g s" #'evil-avy-goto-symbol-1))
 
-(defvar evil-collection-company-use-tng nil)
+(defvar evil-collection-company-use-tng t)
 (use-package evil-collection
   :after (evil)
   :defer 3
@@ -437,7 +437,10 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
                   company-begin-commands '(self-insert-command)
                   company-auto-complete #'company-explicit-action-p
                   company-auto-complete-chars '(?\ ?\( ?\) ?.))
-            (global-company-mode +1))
+            (global-company-mode +1)
+            (general-unbind company-active-map
+              "RET"
+              [return]))
   :general (:states 'insert
                     "TAB" #'company-indent-or-complete-common))