emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(mu4e): replace obsolete/removed functions

Browse source 
This commit fixes several Doom mu4e functions which are broken on later
versions of mu4e due to the variable prefix change from mu4e~ to mu4e--.
I also added them to the forwards-compatibility aliases.
This commit is contained in:
StrawberryTea 2023-09-20 00:07:17 -05:00 • committed by Henrik Lissner
parent 4b81a70aff
commit a02b4ddfe3
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/email/mu4e/config.el
View file

@ -42,7 +42,8 @@
"read-patch-directory" "replace-first-line-matching" "read-patch-directory" "replace-first-line-matching"
"request-contacts-maybe" "rfc822-phrase-type" "start" "stop" "request-contacts-maybe" "rfc822-phrase-type" "start" "stop"
"temp-window" "update-contacts" "update-mail-and-index-real" "temp-window" "update-contacts" "update-mail-and-index-real"
"update-mail-mode" "update-sentinel-func")) "update-mail-mode" "update-sentinel-func" "view-gather-mime-parts"
"view-open-file" "view-mime-part-to-temp-file"))
(defalias (intern (concat "mu4e--" transferable-suffix)) (defalias (intern (concat "mu4e--" transferable-suffix))
(intern (concat "mu4e~" transferable-suffix)) (intern (concat "mu4e~" transferable-suffix))
"Alias to provide the API of mu4e 1.8 (mu4e~ ⟶ mu4e--).") "Alias to provide the API of mu4e 1.8 (mu4e~ ⟶ mu4e--).")
@ -272,7 +273,7 @@ Acts like a singular `mu4e-view-save-attachments', without the saving."
(lambda (part) (lambda (part)
(when (assoc "attachment" (cdr part)) (when (assoc "attachment" (cdr part))
part)) part))
(mu4e~view-gather-mime-parts)))) (mu4e--view-gather-mime-parts))))
(files (+mu4e-part-selectors parts))) (files (+mu4e-part-selectors parts)))
(cdr (assoc (completing-read "Select attachment: " (mapcar #'car files)) files)) (cdr (assoc (completing-read "Select attachment: " (mapcar #'car files)) files))
(user-error (mu4e-format "No attached files found")))) (user-error (mu4e-format "No attached files found"))))
@ -280,13 +281,13 @@ Acts like a singular `mu4e-view-save-attachments', without the saving."
(defun +mu4e-view-open-attachment () (defun +mu4e-view-open-attachment ()
"Select an attachment, and open it." "Select an attachment, and open it."
(interactive) (interactive)
(mu4e~view-open-file (mu4e--view-open-file
(mu4e~view-mime-part-to-temp-file (cdr (+mu4e-view-select-attachment))))) (mu4e--view-mime-part-to-temp-file (cdr (+mu4e-view-select-attachment)))))
(defun +mu4e-view-select-mime-part-action () (defun +mu4e-view-select-mime-part-action ()
"Select a MIME part, and perform an action on it." "Select a MIME part, and perform an action on it."
(interactive) (interactive)
(let ((labeledparts (+mu4e-part-selectors (mu4e~view-gather-mime-parts)))) (let ((labeledparts (+mu4e-part-selectors (mu4e--view-gather-mime-parts))))
(if labeledparts (if labeledparts
(mu4e-view-mime-part-action (mu4e-view-mime-part-action
(cadr (assoc (completing-read "Select part: " (mapcar #'car labeledparts)) (cadr (assoc (completing-read "Select part: " (mapcar #'car labeledparts))
@ -361,13 +362,14 @@ This should already be the case yet it does not always seem to be."
(defvar +mu4e-main-bullet "⚫" (defvar +mu4e-main-bullet "⚫"
"Prefix to use instead of \" *\" in the mu4e main view. "Prefix to use instead of \" *\" in the mu4e main view.
This is enacted by `+mu4e~main-action-str-prettier-a' and This is enacted by `+mu4e--main-action-str-prettier-a' and
`+mu4e~main-keyval-str-prettier-a'.") `+mu4e--main-keyval-str-prettier-a'.")
(advice-add #'mu4e--key-val :filter-return #'+mu4e~main-keyval-str-prettier-a) (advice-add #'mu4e--key-val :filter-return #'+mu4e--main-keyval-str-prettier-a)
(advice-add #'mu4e--main-action-str :override #'+mu4e~main-action-str-prettier-a) (advice-add #'mu4e--main-action-str :override #'+mu4e--main-action-str-prettier-a)
(when (modulep! :editor evil) (when (modulep! :editor evil)
;; As +mu4e~main-action-str-prettier replaces [k]ey with key q]uit should become quit ;; As +mu4e--main-action-str-prettier replaces [k]ey with key [q]uit should
;; become quit
(setq evil-collection-mu4e-end-region-misc "quit")) (setq evil-collection-mu4e-end-region-misc "quit"))
;; process lock control ;; process lock control