debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 03:48:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: move From header addition to after header intern

Browse source 
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.
This commit is contained in:
Russell Sim 2022-09-20 22:18:03 +02:00 committed by David Bremner
parent 793f298091
commit 82aa1acc0c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
emacs/notmuch-mua.el
View file

@ -416,11 +416,6 @@ moved to the \"To:\" header."
(let ((user-agent (funcall notmuch-mua-user-agent-function))) (let ((user-agent (funcall notmuch-mua-user-agent-function)))
(unless (string-empty-p user-agent) (unless (string-empty-p user-agent)
(push (cons 'User-Agent user-agent) other-headers)))) (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) (notmuch-mua-pop-to-buffer (message-buffer-name "mail" to)
(or switch-function (or switch-function
(notmuch-mua-get-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, ;; Cause `message-setup-1' to do things relevant for mail,
;; such as observe `message-default-mail-headers'. ;; such as observe `message-default-mail-headers'.
(message-this-is-mail t)) (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)) (message-setup-1 headers yank-action send-actions return-action))
(notmuch-fcc-header-setup) (notmuch-fcc-header-setup)
(notmuch-mua--remove-dont-reply-to-names) (notmuch-mua--remove-dont-reply-to-names)