diff options
| author | Michal Sojka <sojkam1@fel.cvut.cz> | 2016-01-02 17:47:44 +0100 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-01-08 08:32:48 -0400 |
| commit | 332b5937751203a6be053b01d47ea8c777a5f60c (patch) | |
| tree | 6b31c8422267191cd563bab1843305bb36546d6d | |
| parent | 7e20d26480553f57d53bd9ec28cae163c1ac91e3 (diff) | |
emacs: Refactor notmuch-mua-mail
This should be more readable.
| -rw-r--r-- | emacs/notmuch-mua.el | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index d4950cb8..2d6825d7 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -320,24 +320,24 @@ modified. This function is notmuch addaptation of (notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers)) (notmuch-mua-pop-to-buffer (message-buffer-name "mail" to)) - (let ((args (list yank-action send-actions))) + (let ((headers + ;; The following sexp is copied from `message-mail' + (nconc + `((To . ,(or to "")) (Subject . ,(or subject ""))) + ;; C-h f compose-mail says that headers should be specified as + ;; (string . value); however all the rest of message expects + ;; headers to be symbols, not strings (eg message-header-format-alist). + ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html + ;; We need to convert any string input, eg from rmail-start-mail. + (dolist (h other-headers other-headers) + (if (stringp (car h)) (setcar h (intern (capitalize (car h)))))))) + (args (list yank-action send-actions))) ;; message-setup-1 in Emacs 23 does not accept return-action ;; argument. Pass it only if it is supplied by the caller. This ;; will never be the case when we're called by `compose-mail' in ;; Emacs 23. (when return-action (nconc args '(return-action))) - (apply 'message-setup-1 - ;; The following sexp is copied from `message-mail' - (nconc - `((To . ,(or to "")) (Subject . ,(or subject ""))) - ;; C-h f compose-mail says that headers should be specified as - ;; (string . value); however all the rest of message expects - ;; headers to be symbols, not strings (eg message-header-format-alist). - ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html - ;; We need to convert any string input, eg from rmail-start-mail. - (dolist (h other-headers other-headers) - (if (stringp (car h)) (setcar h (intern (capitalize (car h))))))) - args)) + (apply 'message-setup-1 headers args)) (notmuch-fcc-header-setup) (message-sort-headers) (message-hide-headers) |