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

emacs: Refactor notmuch-mua-mail

Browse source 
This should be more readable.
This commit is contained in:
Michal Sojka 2016-01-02 17:47:44 +01:00 committed by David Bremner
parent 7e20d26480
commit 332b593775
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
emacs/notmuch-mua.el
View file

@ -320,13 +320,7 @@ modified. This function is notmuch addaptation of
(notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers)) (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))
(let ((args (list yank-action send-actions))) (let ((headers
;; 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' ;; The following sexp is copied from `message-mail'
(nconc (nconc
`((To . ,(or to "")) (Subject . ,(or subject ""))) `((To . ,(or to "")) (Subject . ,(or subject "")))
@ -336,8 +330,14 @@ modified. This function is notmuch addaptation of
;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html
;; We need to convert any string input, eg from rmail-start-mail. ;; We need to convert any string input, eg from rmail-start-mail.
(dolist (h other-headers other-headers) (dolist (h other-headers other-headers)
(if (stringp (car h)) (setcar h (intern (capitalize (car h))))))) (if (stringp (car h)) (setcar h (intern (capitalize (car h))))))))
args)) (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 headers args))
(notmuch-fcc-header-setup) (notmuch-fcc-header-setup)
(message-sort-headers) (message-sort-headers)
(message-hide-headers) (message-hide-headers)