From 7e20d26480553f57d53bd9ec28cae163c1ac91e3 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 2 Jan 2016 17:47:43 +0100 Subject: [PATCH] emacs: Fix mail composition under Emacs 23 Commit 570c0aeb40bd0c3af8174624a55e968f62c44f09 reworked notmuch-mua-mail function in a way that worked only under Emacs 24. The reason was that message-setup-1 took one argument less in Emacs 23. We fix this by only supplying the return-action argument when it is actually set by the caller. --- emacs/notmuch-mua.el | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index a66a3066..d4950cb8 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -320,18 +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)) - (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))))))) - yank-action send-actions return-action) + (let ((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)) (notmuch-fcc-header-setup) (message-sort-headers) (message-hide-headers) -- 2.43.0