--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 29C69431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 25 Mar 2012 05:22:21 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 0Wd3idEp3Hq1 for <notmuch@notmuchmail.org>;\r
+ Sun, 25 Mar 2012 05:22:20 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 35CA0431FAE\r
+ for <notmuch@notmuchmail.org>; Sun, 25 Mar 2012 05:22:20 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SBmSa-0000P1-3G; Sun, 25 Mar 2012 13:22:16 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+ helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1SBmSZ-0002Vv-M4; Sun, 25 Mar 2012 13:22:11 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Adam Wolfe Gordon <awg+notmuch@xvx.ca>, notmuch@notmuchmail.org\r
+Subject: Re: [BUG/PATCH 2/2] emacs: Fix replying from alternate addresses\r
+In-Reply-To: <1332635232-15269-3-git-send-email-awg+notmuch@xvx.ca>\r
+References: <1332635232-15269-1-git-send-email-awg+notmuch@xvx.ca>\r
+ <1332635232-15269-3-git-send-email-awg+notmuch@xvx.ca>User-Agent:\r
+ Notmuch/0.12+65~g8bf1842 (http://notmuchmail.org) Emacs/23.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 25 Mar 2012 13:22:24 +0100\r
+Message-ID: <878vio50qn.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: d1215d7abb7f688dbb3968b66ae41d5e (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+ * domain\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 25 Mar 2012 12:22:21 -0000\r
+\r
+Adam Wolfe Gordon <awg+notmuch@xvx.ca> writes:\r
+> The bug was that notmuch-mua-mail used `mail-header` to check whether\r
+> it was passed a "From" header. The implementation of `mail-header`\r
+> must try to compare symbols instead of strings when looking for\r
+> headers, as it was returning nil when a From header was present. This\r
+> is probably because the mail functions construct headers as alists\r
+> with symbols for the header names, while our code uses strings for the\r
+> header names.\r
+>\r
+> Since we don't use `mail-header` anywhere else, and `message-mail` is\r
+> perfectly happy to accept string header names, the fix is just to use\r
+> `assoc` to look for the From header, so that the strings get compared\r
+> properly.\r
+\r
+I can confirm that everything works as expected with this fix. \r
+\r
+Best wishes\r
+\r
+Mark\r
+> ---\r
+> emacs/notmuch-mua.el | 4 ++--\r
+> test/emacs | 1 -\r
+> 2 files changed, 2 insertions(+), 3 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+> index 6aae3a0..9805d79 100644\r
+> --- a/emacs/notmuch-mua.el\r
+> +++ b/emacs/notmuch-mua.el\r
+> @@ -187,7 +187,7 @@ OTHER-ARGS are passed through to `message-mail'."\r
+> (when (not (string= "" user-agent))\r
+> (push (cons "User-Agent" user-agent) other-headers))))\r
+> \r
+> - (unless (mail-header 'From other-headers)\r
+> + (unless (assoc "From" other-headers)\r
+> (push (cons "From" (concat\r
+> (notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers))\r
+> \r
+> @@ -250,7 +250,7 @@ the From: address first."\r
+> (interactive "P")\r
+> (let ((other-headers\r
+> (when (or prompt-for-sender notmuch-always-prompt-for-sender)\r
+> - (list (cons 'From (notmuch-mua-prompt-for-sender))))))\r
+> + (list (cons "From" (notmuch-mua-prompt-for-sender))))))\r
+> (notmuch-mua-mail nil nil other-headers)))\r
+> \r
+> (defun notmuch-mua-new-forward-message (&optional prompt-for-sender)\r
+> diff --git a/test/emacs b/test/emacs\r
+> index fa5d706..08db1ee 100755\r
+> --- a/test/emacs\r
+> +++ b/test/emacs\r
+> @@ -275,7 +275,6 @@ EOF\r
+> test_expect_equal_file OUTPUT EXPECTED\r
+> \r
+> test_begin_subtest "Reply from alternate address within emacs"\r
+> -test_subtest_known_broken\r
+> add_message '[from]="Sender <sender@example.com>"' \\r
+> [to]=test_suite_other@notmuchmail.org \\r
+> [subject]=notmuch-reply-test \\r
+> -- \r
+> 1.7.5.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff