summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
authorAlan Pearce2018-10-17 22:26:57 +0200
committerAlan Pearce2018-10-17 22:26:57 +0200
commit2f34d805d7a5ef43fd37c449b00a8c3affa2bc78 (patch)
tree7e17e049b2cb33091d2140ef3371ba9fda4c5bda /emacs
parent96a53b4e95bcb1113e57b8d2debca0814b6bfaf1 (diff)
downloadnixfiles-2f34d805d7a5ef43fd37c449b00a8c3affa2bc78.tar.lz
nixfiles-2f34d805d7a5ef43fd37c449b00a8c3affa2bc78.tar.zst
nixfiles-2f34d805d7a5ef43fd37c449b00a8c3affa2bc78.zip
Emacs: Fix evil/evil-collection compatibility
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/main.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 8f643c05..960ad8f3 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -2399,7 +2399,7 @@ Pass ARG to `comint-delchar-or-maybe-eof'."
 
 ;;;; Evil
 
-(setq evil-want-integration nil)
+(setq evil-want-keybinding nil)
 
 (use-package evil-leader
   ;; must load before evil-mode