diff options
| author | Russell Sim <russell.sim@gmail.com> | 2022-09-20 22:18:03 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2022-11-05 13:30:50 -0400 |
| commit | 82aa1acc0c6a66eb3b771357e513eb4d16f9f276 (patch) | |
| tree | 24f77e79d3758fd85d2b703e29c3d36801037bf9 /emacs | |
| parent | 793f2980910f612fa33806ef71fa7ee35d093657 (diff) | |
emacs: move From header addition to after header intern
OTHER-HEADERS are expected to be passed as strings, to match the
implementation of `compose-mail'. But the "From" header is currently
expected to be passed as a symbol. Instead the "From" header can be
safely added after converting all the headers to symbols.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/notmuch-mua.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index ac878a61..3679d7d7 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -416,11 +416,6 @@ moved to the \"To:\" header." (let ((user-agent (funcall notmuch-mua-user-agent-function))) (unless (string-empty-p user-agent) (push (cons 'User-Agent user-agent) other-headers)))) - (unless (assq 'From other-headers) - (push (cons 'From (message-make-from - (notmuch-user-name) - (notmuch-user-primary-email))) - other-headers)) (notmuch-mua-pop-to-buffer (message-buffer-name "mail" to) (or switch-function (notmuch-mua-get-switch-function))) @@ -439,6 +434,11 @@ moved to the \"To:\" header." ;; Cause `message-setup-1' to do things relevant for mail, ;; such as observe `message-default-mail-headers'. (message-this-is-mail t)) + (unless (assq 'From headers) + (push (cons 'From (message-make-from + (notmuch-user-name) + (notmuch-user-primary-email))) + headers)) (message-setup-1 headers yank-action send-actions return-action)) (notmuch-fcc-header-setup) (notmuch-mua--remove-dont-reply-to-names) |