From 1ec5a24e864217240f1a24a1b4a0004216a0dc2b Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 17 Jun 2019 11:58:23 +0200
Subject: Emacs: fix leader in magit

---
 emacs/.emacs.d/main.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 5cb70525..a477f749 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -102,6 +102,7 @@ With two prefix arguments, write out the day and month name."
 (use-package general
   :functions (general-unbind general-define-key)
   :config (progn
+	    (general-override-mode +1)
             (when (eq system-type 'darwin)
               (general-unbind "s-x"))))
 
@@ -183,12 +184,14 @@ With two prefix arguments, write out the day and month name."
   :config (evil-collection-init))
 
 (general-create-definer my-leader-def
+  :keymaps 'override
+  :states '(normal motion)
   :prefix ",")
 
 (use-package evil-space
   :defer 1
   :config (progn
-            (evil-space-mode)))
+            (evil-space-mode +1)))
 
 (use-package evil-surround
   :custom ((global-evil-surround-mode t)))
@@ -466,7 +469,7 @@ With two prefix arguments, write out the day and month name."
 ;;; Take me to my leader
 
 (my-leader-def
- :keymaps 'normal
+ "" nil
  "h" '(:keymap ehelp-map)
  "w" '(:keymap evil-window-map)
  "x" '(:keymap ctl-x-map)
-- 
cgit 1.4.1