emacs
/
evil-collection
mirror of https://github.com/jojojames/evil-collection.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu4e: use newly-renamed functions as aliases when appropriate 

This accommodates everyone using a version of mu4e shipped with their
package manager's installation of mu.
This commit is contained in:
Brian Leung 2022-02-20 18:26:48 -08:00 committed by Youmu
parent 081a9f423e
commit 260842f096
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
modes/mu4e/evil-collection-mu4e.el
View File

@ -70,6 +70,23 @@
(declare-function mu4e--main-action-str "mu4e-main")
(declare-function mu4e--main-view-queue "mu4e-main")
(defun evil-collection-mu4e--main-action-str (&rest args)
"Wrapper for `mu4e--main-action-str' to maintain compatibility
with older release versions of `mu4e.'"
(apply (if (fboundp 'mu4e~main-action-str)
#'mu4e~main-action-str
#'mu4e--main-action-str)
args))
(defun evil-collection-mu4e--main-view-queue (&rest args)
"Wrapper for `mu4e--main-view-queue' to maintain compatibility
with older release versions of `mu4e.'"
(apply (if (fboundp 'mu4e~main-view-queue)
#'mu4e~main-view-queue
#'mu4e--main-view-queue)
args))
(defvar smtpmail-send-queued-mail)
(defvar smtpmail-queue-dir)
@ -275,9 +292,9 @@
"The place where to end overriding Basic section.")
(defvar evil-collection-mu4e-new-region-basic
(concat (mu4e--main-action-str "\t* [J]ump to some maildir\n" 'mu4e-jump-to-maildir)
(mu4e--main-action-str "\t* enter a [s]earch query\n" 'mu4e-search)
(mu4e--main-action-str "\t* [C]ompose a new message\n" 'mu4e-compose-new))
(concat (evil-collection-mu4e--main-action-str "\t* [J]ump to some maildir\n" 'mu4e-jump-to-maildir)
(evil-collection-mu4e--main-action-str "\t* enter a [s]earch query\n" 'mu4e-search)
(evil-collection-mu4e--main-action-str "\t* [C]ompose a new message\n" 'mu4e-compose-new))
"Define the evil-mu4e Basic region.")
(defvar evil-collection-mu4e-begin-region-misc "\n Misc"
@ -289,20 +306,20 @@
(defun evil-collection-mu4e-new-region-misc ()
"Define the evil-mu4e Misc region."
(concat
(mu4e--main-action-str "\t* [;]Switch focus\n" 'mu4e-context-switch)
(mu4e--main-action-str "\t* [u]pdate email & database (Alternatively: gr)\n"
(evil-collection-mu4e--main-action-str "\t* [;]Switch focus\n" 'mu4e-context-switch)
(evil-collection-mu4e--main-action-str "\t* [u]pdate email & database (Alternatively: gr)\n"
'mu4e-update-mail-and-index)
;; show the queue functions if `smtpmail-queue-dir' is defined
(if (file-directory-p smtpmail-queue-dir)
(mu4e--main-view-queue)
(evil-collection-mu4e--main-view-queue)
"")
"\n"
(mu4e--main-action-str "\t* [N]ews\n" 'mu4e-news)
(mu4e--main-action-str "\t* [A]bout mu4e\n" 'mu4e-about)
(mu4e--main-action-str "\t* [H]elp\n" 'mu4e-display-manual)
(mu4e--main-action-str "\t* [q]uit\n" 'mu4e-quit)))
(evil-collection-mu4e--main-action-str "\t* [N]ews\n" 'mu4e-news)
(evil-collection-mu4e--main-action-str "\t* [A]bout mu4e\n" 'mu4e-about)
(evil-collection-mu4e--main-action-str "\t* [H]elp\n" 'mu4e-display-manual)
(evil-collection-mu4e--main-action-str "\t* [q]uit\n" 'mu4e-quit)))
(defun evil-collection-mu4e-replace-region (new-region start end)
"Replace region between START and END with NEW-REGION.