From: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon, 16 Nov 2020 21:28:22 +0000 (+0100)
Subject: emacs: fix old bug in notmuch-mua-mail
X-Git-Tag: 0.32_rc0~195
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=f061ae5b427136b759957622210d5f83e5e61e5a

emacs: fix old bug in notmuch-mua-mail

This fixes a regression introduced in [1: 7e20d264].  If the argument
RETURN-ACTION was non-nil then we should pass along the value of that
argument.  Instead we passed along the constant symbol `return-action'.

1: 7e20d26480553f57d53bd9ec28cae163c1ac91e3
   emacs: Fix mail composition under Emacs 23
---

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 616b625c..1204fb6a 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -402,7 +402,7 @@ modified. This function is notmuch adaptation of
     ;; 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)))
+    (when return-action (nconc args (list return-action)))
     (apply 'message-setup-1 headers args))
   (notmuch-fcc-header-setup)
   (message-sort-headers)