From 59335cf6631a23672e77e86b934f4247ae5bf67e Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Tue, 19 Apr 2022 14:31:07 +0200
Subject: [PATCH] [Emacs] Fix Magit keybinds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With a recent package update, whether by Magit’s or Evil Collection’s
fault, the keybinds for `c` and `t` got replaced with evil movement up
and down instead of respectively staging and tagging in Magit. This
commit fixes this behavior.
---
 org/config/emacs.org | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/org/config/emacs.org b/org/config/emacs.org
index c2757b0..a187f34 100644
--- a/org/config/emacs.org
+++ b/org/config/emacs.org
@@ -2597,6 +2597,13 @@ doing and what Git is doing! In short, I absolutely love it!
   (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)
   :config
   (setq magit-clone-default-directory "~/fromGIT/")
+  (with-eval-after-load 'evil-collection
+    (phundrak/evil
+      :packages '(evil-collection magit)
+      :keymaps '(magit-mode-map magit-log-mode-map magit-status-mode-map)
+      :states 'normal
+      "t" #'magit-tag
+      "s" #'magit-stage))
   :general
   (:keymaps '(git-rebase-mode-map)
    :packages 'magit