From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sat, 2 Jan 2016 16:47:44 +0000 (+0100)
Subject: emacs: Refactor notmuch-mua-mail
X-Git-Tag: 0.22_rc0~83
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=332b5937751203a6be053b01d47ea8c777a5f60c

emacs: Refactor notmuch-mua-mail

This should be more readable.
---

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)