From 3066594eb8688b5e827b9dc223e176e76d0c7165 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <ambrevar@gmail.com>
Date: Sat, 16 Jun 2018 19:25:19 +0200
Subject: [PATCH] Evil: Use Ediff and mu4e bindings from Evil Collection

---
 .emacs.d/init.el           |  2 +-
 .emacs.d/lisp/init-evil.el | 60 +++++++++++++++++---------------------
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 8a05433..731ef04 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -134,7 +134,7 @@
 ;;; Evil
 (nconc package-selected-packages '(evil
                                    evil-commentary evil-multiedit
-                                   evil-ediff evil-magit evil-mu4e evil-org evil-collection))
+                                   evil-magit evil-org evil-collection))
 (setq evil-want-integration nil)
 (when (require 'evil nil t) (require 'init-evil))
 
diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el
index c584fc0..29a5644 100644
--- a/.emacs.d/lisp/init-evil.el
+++ b/.emacs.d/lisp/init-evil.el
@@ -143,38 +143,32 @@
   ">" 'nxml-down-element
   "<" 'nxml-backward-up-element)
 
-(when (require 'evil-mu4e nil t)
-  (evil-define-key 'normal mu4e-main-mode-map
-    "s" 'helm-mu)
-  (evil-define-key 'normal mu4e-headers-mode-map
-    ;; "r" 'mu4e-compose-reply
-    "s" 'helm-mu
-    ;; Custom
-    "x" 'ambrevar/mu4e-mark-execute-all-no-confirm
-    "d" 'ambrevar/mu4e-headers-move-to-trash)
-  (evil-define-key 'visual mu4e-headers-mode-map
-    "s" 'helm-mu
-    ;; Custom
-    "x" 'ambrevar/mu4e-mark-execute-all-no-confirm
-    "d" 'ambrevar/mu4e-headers-move-to-trash)
-  (evil-define-key 'normal mu4e-view-mode-map
-    ;; "r" 'mu4e-compose-reply
-    "s" 'helm-mu
-    ;; Custom
-    "d" 'ambrevar/mu4e-view-move-to-trash
-    "x" 'ambrevar/mu4e-mark-execute-all-no-confirm)
-  ;; (evil-define-key 'visual mu4e-view-mode-map
-  ;;   ;; "r" 'mu4e-compose-reply
-  ;;   "s" 'helm-mu
-  ;;   ;; Custom
-  ;;   "d" 'ambrevar/mu4e-view-move-to-trash
-  ;;   "x" 'ambrevar/mu4e-mark-execute-all-no-confirm)
-  ;; (evil-define-key 'normal mu4e-compose-mode-map
-  ;;   "gg" 'mu4e-compose-goto-top) ; TODO: Move this upstream?
-  ;; (when (require 'mu4e-conversation nil t)
-  ;;   (evil-define-key 'normal mu4e-headers-mode-map
-  ;;     (kbd "<return>") 'mu4e-conversation))
-  )
+
+(defun ambrevar/evil-mu4e (mode _mode-keymaps &rest _rest)
+  (when (eq mode 'mu4e)
+    (evil-define-key 'normal mu4e-main-mode-map
+      "s" 'helm-mu)
+    (evil-define-key 'normal mu4e-headers-mode-map
+      ;; "r" 'mu4e-compose-reply
+      "s" 'helm-mu
+      ;; Custom
+      "x" 'ambrevar/mu4e-mark-execute-all-no-confirm
+      "d" 'ambrevar/mu4e-headers-move-to-trash)
+    (evil-define-key 'visual mu4e-headers-mode-map
+      "s" 'helm-mu
+      ;; Custom
+      "x" 'ambrevar/mu4e-mark-execute-all-no-confirm
+      "d" 'ambrevar/mu4e-headers-move-to-trash)
+    (evil-define-key 'normal mu4e-view-mode-map
+      ;; "r" 'mu4e-compose-reply
+      "s" 'helm-mu
+      ;; Custom
+      "d" 'ambrevar/mu4e-view-move-to-trash
+      "x" 'ambrevar/mu4e-mark-execute-all-no-confirm)
+    ;; (evil-define-key 'normal mu4e-compose-mode-map
+    ;;   "gg" 'mu4e-compose-goto-top) ; TODO: Move this upstream?
+    ))
+(add-hook 'evil-collection-setup-hook 'ambrevar/evil-mu4e)
 
 (with-eval-after-load 'mu4e-conversation
   ;; (evil-define-key 'normal mu4e-conversation-mode-map
@@ -207,8 +201,6 @@
     (evil-magit-define-key evil-magit-state 'magit-mode-map "M-j" 'magit-section-forward)
     (evil-magit-define-key evil-magit-state 'magit-mode-map "M-k" 'magit-section-backward)))
 
-(require 'evil-ediff nil t)
-
 (with-eval-after-load 'org
   ;; Don't require evil-org before org is loaded.
   ;; Elfeed-link is loaded after org.