From 29fa494053cf3029be1f17741b77971e3ce0d6bb Mon Sep 17 00:00:00 2001
From: Fabien Dubosson <fabien.dubosson@gmail.com>
Date: Sat, 10 Feb 2018 23:34:16 +0100
Subject: [PATCH] [keyboard-layout] Split `evil-magit` and `magit`
 configurations

Fix #10133 and #10229, supersede #10148
Modification as suggested in [1].

[1] https://github.com/syl20bnr/spacemacs/pull/10148#issuecomment-357577446
---
 layers/+intl/keyboard-layout/packages.el | 75 +++++++++++++-----------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/layers/+intl/keyboard-layout/packages.el b/layers/+intl/keyboard-layout/packages.el
index 89093e09e..7591aa832 100644
--- a/layers/+intl/keyboard-layout/packages.el
+++ b/layers/+intl/keyboard-layout/packages.el
@@ -19,6 +19,7 @@
     evil
     evil-escape
     evil-evilified-state
+    evil-magit
     evil-surround
     eyebrowse
     flycheck
@@ -227,6 +228,24 @@
       "k"
       "l")))
 
+(defun keyboard-layout/pre-init-evil-magit ()
+  (kl|config evil-magit
+    :description
+    "Remap `evil-magit' bindings."
+    :loader
+    (with-eval-after-load 'evil-magit BODY)
+    :common
+    (dolist (state (if evil-magit-use-y-for-yank
+                       (list evil-magit-state 'visual)
+                     (list evil-magit-state)))
+      (kl/evil-correct-keys state magit-mode-map
+        "j"
+        "k"
+        "C-j"
+        "C-k"))
+    (kl/evil-correct-keys 'normal evil-magit-toggle-text-minor-mode-map
+      "C-j")))
+
 (defun keyboard-layout/pre-init-evil-surround ()
   (kl|config evil-surround
     :description
@@ -357,46 +376,34 @@
     :loader
     (spacemacs|use-package-add-hook magit :post-config BODY)
     :common
-    (progn
-      (dolist (state (if evil-magit-use-y-for-yank
-                         (list evil-magit-state 'visual)
-                       (list evil-magit-state)))
-        (kl/evil-correct-keys state magit-mode-map
-          "j"
-          "k"
-          "C-j"
-          "C-k"))
-      (kl/evil-correct-keys 'normal evil-magit-toggle-text-minor-mode-map
-        "C-j")
-      (dolist (map (list magit-branch-section-map
-                         magit-commit-section-map
-                         magit-file-section-map
-                         magit-hunk-section-map
-                         magit-remote-section-map
-                         magit-staged-section-map
-                         magit-unstaged-section-map
-                         magit-module-commit-section-map
-                         magit-stash-section-map
-                         magit-stashes-section-map
-                         magit-tag-section-map
-                         magit-unpulled-section-map
-                         magit-unpushed-section-map
-                         magit-untracked-section-map))
-        (kl/correct-keys map
-          "j"
-          "k"
-          "C-j"
-          "C-k")))
+    (dolist (map (list magit-branch-section-map
+                       magit-commit-section-map
+                       magit-file-section-map
+                       magit-hunk-section-map
+                       magit-remote-section-map
+                       magit-staged-section-map
+                       magit-unstaged-section-map
+                       magit-module-commit-section-map
+                       magit-stash-section-map
+                       magit-stashes-section-map
+                       magit-tag-section-map
+                       magit-unpulled-section-map
+                       magit-unpushed-section-map
+                       magit-untracked-section-map))
+      (kl/correct-keys map
+        "j"
+        "k"
+        "C-j"
+        "C-k"))
     :bepo
     (progn
       (magit-change-popup-key 'magit-dispatch-popup :actions ?t ?j)
       (magit-change-popup-key 'magit-dispatch-popup :actions ?s ?k)
       (magit-change-popup-key 'magit-dispatch-popup :actions ?S ?K))
     :colemak-jkhl
-    (progn
-      (kl/evil-correct-keys 'visual magit-mode-map
-        "j"
-        "k"))))
+    (kl/evil-correct-keys 'visual magit-mode-map
+      "j"
+      "k")))
 
 (defun keyboard-layout/pre-init-mu4e ()
   (kl|config mu4e