summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
authorAlan Pearce2019-06-18 14:34:15 +0200
committerAlan Pearce2019-06-18 14:34:15 +0200
commita479c4f4e26946775f8f84685b168026e8dca87c (patch)
treee52b742fa3c85db5890d158d1107fad134578f5b /emacs
parent5edf77e46d385f10ac6c531794e56ca5b2960e5f (diff)
downloadnixfiles-a479c4f4e26946775f8f84685b168026e8dca87c.tar.lz
nixfiles-a479c4f4e26946775f8f84685b168026e8dca87c.tar.zst
nixfiles-a479c4f4e26946775f8f84685b168026e8dca87c.zip
Emacs: disable evil-quickscope in magit-mode
It seems to override magit's keybindings, although it wasn't doing
that before
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/main.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index d32f2eb6..7b537343 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -220,6 +220,8 @@ With two prefix arguments, write out the day and month name."
 
 (use-package evil-quickscope
   :after evil
+  :commands (evil-quickscope-mode)
+  :ghook ('magit-mode-hook (lambda () (evil-quickscope-mode -1)))
   :custom ((global-evil-quickscope-mode t)))
 
 (use-package evil-org