Replace mu4e multiple accounts with contexts

layers/+email/mu4e/README.org

@@ -46,45 +46,52 @@ This extension is enabled by default, you can deactivate (and uninstall) it by
 adding the package == to your dotfile variable =dotspacemacs-excluded-packages=.
 
 ** Multiple Accounts
-This layer includes support for multiple sending accounts.
-If you have only one account you do not need to define this variable.
-If you have multiple accounts, configure the =mu4e-account-alist= variable:
+With mu 0.9.16, mu4e comes with a native contexts feature for managing multiple accounts.
+The following example is taken from the manual:
 
 #+BEGIN_SRC emacs-lisp
-  (setq mu4e-account-alist
-        '(("gmail"
-           ;; Under each account, set the account-specific variables you want.
-           (mu4e-sent-messages-behavior delete)
-           (mu4e-sent-folder "/gmail/[Gmail]/.Sent Mail")
-           (mu4e-drafts-folder "/gmail/[Gmail]/.Drafts")
-           (user-mail-address "billy@gmail.com")
-           (user-full-name "Billy"))
-          ("college"
-           (mu4e-sent-messages-behavior sent)
-           (mu4e-sent-folder "/college/Sent Items")
-           (mu4e-drafts-folder "/college/Drafts")
-           (user-mail-address "bb15@college.edu")
-           (user-full-name "Billy Bob 15"))))
-  (mu4e/mail-account-reset)
+  (setq mu4e-contexts
+    `( ,(make-mu4e-context
+    :name "Private"
+    :enter-func (lambda () (mu4e-message "Switch to the Private context"))
+    ;; leave-func not defined
+    :match-func (lambda (msg)
+      (when msg
+        (mu4e-message-contact-field-matches msg
+          :to "aliced@home.example.com")))
+    :vars '(  ( user-mail-address      . "aliced@home.example.com"  )
+       ( user-full-name     . "Alice Derleth" )
+       ( mu4e-compose-signature .
+         (concat
+           "Alice Derleth\n"
+           "Lauttasaari, Finland\n"))))
+       ,(make-mu4e-context
+    :name "Work"
+    :enter-func (lambda () (mu4e-message "Switch to the Work context"))
+    ;; leave-fun not defined
+    :match-func (lambda (msg)
+      (when msg
+        (mu4e-message-contact-field-matches msg
+          :to "aderleth@miskatonic.example.com")))
+    :vars '(  ( user-mail-address      . "aderleth@miskatonic.example.com" )
+       ( user-full-name     . "Alice Derleth" )
+       ( mu4e-compose-signature .
+         (concat
+           "Prof. Alice Derleth\n"
+           "Miskatonic University, Dept. of Occult Sciences\n"))))))
+
+  ;; set `mu4e-context-policy` and `mu4e-compose-policy` to tweak when mu4e should
+  ;; guess or ask the correct context, e.g.
+
+  ;; start with the first (default) context;
+  ;; default is to ask-if-none (ask when there's no context yet, and none match)
+  ;; (setq mu4e-context-policy 'pick-first)
+
+  ;; compose with the current context is no context matches;
+  ;; default is to ask
+  ;; '(setq mu4e-compose-context-policy nil)
 #+END_SRC
 
-The first account listed will be the default account, so variables like
-=user-full-name=, which is used by other parts of Emacs, will have their value
-reset for the default account after sending each email.
-
-Note that the mu4e layer expects =mu4e-account-alist= to be defined before the
-layer is loaded. For example, you can set =mu4e-account-alist= to a dummy
-setting in =dotspacemacs/layers=:
-
-#+BEGIN_SRC emacs-lisp
-(mu4e :variables mu4e-account-alist t)
-#+END_SRC
-
-and then actually set =mu4e-account-alist= later in =dotspacemacs/user-config=.
-
-Make sure you call =mu4e/mail-account-reset= afterward, which will initialize
-the given account variables.
-
 ** Example configuration
 #+BEGIN_SRC emacs-lisp
   ;;; Set up some common mu4e variables

layers/+email/mu4e/config.el

@@ -12,8 +12,5 @@
 (defvar mu4e-installation-path nil
   "Installation path for mu4e.")
 
-(defvar mu4e-account-alist nil
-  "Account alist for custom multi-account compose.")
-
 (when mu4e-installation-path
   (push mu4e-installation-path load-path))

layers/+email/mu4e/packages.el

@@ -40,11 +40,7 @@
               'helm-completing-read))
 
       (add-to-list 'mu4e-view-actions
-                   '("View in browser" . mu4e-action-view-in-browser) t)
-
-      (when mu4e-account-alist
-        (add-hook 'mu4e-compose-pre-hook 'mu4e/set-account)
-        (add-hook 'message-sent-hook 'mu4e/mail-account-reset)))))
+                   '("View in browser" . mu4e-action-view-in-browser) t))))
 
 (defun mu4e/init-mu4e-maildirs-extension ()
   (use-package mu4e-maildirs-extension