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

mu4e: Adjust config to mu4e 1.4

Browse source 
mu4e 1.4 brings quite a few changes, including the deprecation of
previously used variables. These are now guarded by a version
comparison. org-mu4e is not needed for linking anymore,
org-mu4e-link-query-in-headers-mode was renamed. It's new version
defaults to nil and is therefore not set anymore -- I am not sure if the
default was changed or setting it was not strictly needed previously.
This commit is contained in:
Alexander Graul 2020-04-22 23:38:07 +02:00 • committed by Alexander Graul
parent e0f8fbee22
commit 9fe35c5fa4
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/email/mu4e/autoload/email.el
View file

@ -6,7 +6,7 @@
list of cons cells (VARIABLE . VALUE) -- you may want to modify: list of cons cells (VARIABLE . VALUE) -- you may want to modify:
+ `user-full-name' (this or the global `user-full-name' is required) + `user-full-name' (this or the global `user-full-name' is required)
+ `user-mail-address' (required) + `user-mail-address' (required in mu4e < 1.4)
+ `smtpmail-smtp-user' (required for sending mail from Emacs) + `smtpmail-smtp-user' (required for sending mail from Emacs)
OPTIONAL: OPTIONAL:
@ -19,8 +19,9 @@ OPTIONAL:
DEFAULT-P is a boolean. If non-nil, it marks that email account as the DEFAULT-P is a boolean. If non-nil, it marks that email account as the
default/fallback account." default/fallback account."
(after! mu4e (after! mu4e
(when-let (address (cdr (assq 'user-mail-address letvars))) (when (version< mu4e-mu-version "1.4")
(add-to-list 'mu4e-user-mail-address-list address)) (when-let (address (cdr (assq 'user-mail-address letvars)))
(add-to-list 'mu4e-user-mail-address-list address)))
(setq mu4e-contexts (setq mu4e-contexts
(cl-loop for context in mu4e-contexts (cl-loop for context in mu4e-contexts
unless (string= (mu4e-context-name context) label) unless (string= (mu4e-context-name context) label)

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

@ -14,9 +14,11 @@
:commands mu4e mu4e-compose-new :commands mu4e mu4e-compose-new
:init :init
(provide 'html2text) ; disable obsolete package (provide 'html2text) ; disable obsolete package
(setq mu4e-maildir "~/.mail" (require 'mu4e-meta)
mu4e-attachment-dir "~/.mail/.attachments" (when (version< mu4e-mu-version "1.4")
mu4e-user-mail-address-list nil) (setq mu4e-maildir "~/.mail"
mu4e-user-mail-address-list nil))
(setq mu4e-attachment-dir "~/.mail/.attachments")
:config :config
(pcase +mu4e-backend (pcase +mu4e-backend
(`mbsync (`mbsync
@ -104,8 +106,9 @@
(use-package! org-mu4e (use-package! org-mu4e
:hook (mu4e-compose-mode . org-mu4e-compose-org-mode) :hook (mu4e-compose-mode . org-mu4e-compose-org-mode)
:config :config
(setq org-mu4e-link-query-in-headers-mode nil (setq org-mu4e-convert-to-html t)
org-mu4e-convert-to-html t) (when (version< mu4e-mu-version "1.4")
(setq org-mu4e-link-query-in-headers-mode nil))
;; Only render to html once. If the first send fails for whatever reason, ;; Only render to html once. If the first send fails for whatever reason,
;; org-mu4e would do so each time you try again. ;; org-mu4e would do so each time you try again.