diff options
| author | Brian Leung <leungbk@posteo.net> | 2022-02-20 18:26:48 -0800 |
|---|---|---|
| committer | Youmu <condy0919@gmail.com> | 2022-02-21 12:08:48 +0800 |
| commit | 260842f0960ad42fd200d65af1d4940499a9c232 (patch) | |
| tree | be04854ede5fdf8f89d6a59a3128448197b77bc6 /modes/mu4e | |
| parent | 081a9f423e95d57fa3c10dee18fa148df5ed198f (diff) | |
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.
Diffstat (limited to 'modes/mu4e')
| -rw-r--r-- | modes/mu4e/evil-collection-mu4e.el | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/modes/mu4e/evil-collection-mu4e.el b/modes/mu4e/evil-collection-mu4e.el index 886a5b7..5605557 100644 --- a/modes/mu4e/evil-collection-mu4e.el +++ b/modes/mu4e/evil-collection-mu4e.el @@ -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. |