From a479c4f4e26946775f8f84685b168026e8dca87c Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 18 Jun 2019 14:34:15 +0200
Subject: Emacs: disable evil-quickscope in magit-mode

It seems to override magit's keybindings, although it wasn't doing
that before
---
 emacs/.emacs.d/main.el | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'emacs')

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
-- 
cgit 1.4.1