From 7f0ca974e9db1409e0f24ac74e511f25dafc0182 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 19 Oct 2019 17:42:31 -0400
Subject: [PATCH] tools/magit: free up 0-4 keys for evil & bind g=

- Replaces 0 with g= (magit-diff-default-context)
- Unbinds 1-4 keys so you can use numbered motions in magit buffers
  again
---
 modules/tools/magit/config.el | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index 67d9d3a00..460bb2f78 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -131,11 +131,16 @@ ensure it is built when we actually use Forge."
   (setq evil-magit-state 'normal
         evil-magit-use-z-for-folds t)
   :config
-  (unmap! magit-mode-map "M-1" "M-2" "M-3" "M-4") ; replaced by z1, z2, z3, etc
+  (unmap! magit-mode-map
+    ;; Replaced by z1, z2, z3, etc
+    "M-1" "M-2" "M-3" "M-4"
+    "1" "2" "3" "4"
+    "0") ; moved to g=
   (evil-define-key* 'normal magit-status-mode-map [escape] nil) ; q is enough
   (evil-define-key* '(normal visual) magit-mode-map
+    "%"  #'magit-gitflow-popup
     "zz" #'evil-scroll-line-to-center
-    "%"  #'magit-gitflow-popup)
+    "g=" #'magit-diff-default-context)
   (define-key! 'normal
     (magit-status-mode-map
      magit-stash-mode-map