fix(mu4e): fixes related to evil-collection

abougouffa · Mar 27, 2023 · 56533ad · 56533ad
1 parent b3588e9
commit 56533ad
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/core/me-evil.el b/core/me-evil.el
@@ -65,9 +65,15 @@
 
   ;; TEMP: Fix `mu4e' evil integraion
   (with-eval-after-load 'mu4e
+    (require 'loadhist) ; to use `feature-file'
+
+    ;; To avoid calling `evil-collection-mu4e--main-action-str'
+    (defvar evil-collection-mu4e-new-region-basic nil)
+
     (require 'evil-collection-mu4e
              (concat (file-name-directory (feature-file 'evil-collection))
                      "modes/mu4e/evil-collection-mu4e.el"))
+
     (evil-collection-mu4e-set-state)
     (evil-collection-mu4e-set-bindings)
 

diff --git a/modules/extras/me-mu4e-ui.el b/modules/extras/me-mu4e-ui.el
@@ -222,15 +222,15 @@ will also be the width of all other printable characters."
   ;; Evil collection overwrite the jump, search, compose and quit commands
   ;; TODO: Useless now, to be updated/deleted when `evil-collection-mu4e' gets
   ;; fixed.
-  (with-eval-after-load 'evil-collection
-    (setq evil-collection-mu4e-new-region-basic
-          (concat (+mu4e--main-action-prettier-a
-                   "\t* [J]ump to some maildir\n" 'mu4e-search-maildir)
-                  (+mu4e--main-action-prettier-a
-                   "\t* Enter a [s]earch query\n" 'mu4e-search)
-                  (+mu4e--main-action-prettier-a
-                   "\t* [C]ompose a new message\n" 'mu4e-compose-new))
-          evil-collection-mu4e-end-region-misc "quit"))
+  ;; (with-eval-after-load 'evil-collection
+  ;;   (setq evil-collection-mu4e-new-region-basic
+  ;;         (concat (+mu4e--main-action-prettier-a
+  ;;                  "\t* [J]ump to some maildir\n" 'mu4e-search-maildir)
+  ;;                 (+mu4e--main-action-prettier-a
+  ;;                  "\t* Enter a [s]earch query\n" 'mu4e-search)
+  ;;                 (+mu4e--main-action-prettier-a
+  ;;                  "\t* [C]ompose a new message\n" 'mu4e-compose-new))
+  ;;         evil-collection-mu4e-end-region-misc "quit"))
 
   (advice-add #'mu4e--key-val :filter-return #'+mu4e--main-keyval-str-prettier-a)
   (advice-add #'mu4e--main-action :override #'+mu4e--main-action-prettier-a))