--- /dev/null
+Return-Path: <dmitry.kurochkin@gmail.com>\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 102D7431FAF\r
+ for <notmuch@notmuchmail.org>; Mon, 26 Mar 2012 10:04:05 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 f7VyfA7MxSsz for <notmuch@notmuchmail.org>;\r
+ Mon, 26 Mar 2012 10:04:04 -0700 (PDT)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+ [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 5B617431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 26 Mar 2012 10:04:04 -0700 (PDT)\r
+Received: by bkwj4 with SMTP id j4so4830945bkw.26\r
+ for <notmuch@notmuchmail.org>; Mon, 26 Mar 2012 10:04:03 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:subject:in-reply-to:references:date:message-id:mime-version\r
+ :content-type; bh=VLxhMZ73SDfOdjyV6ahbHx697yC2hNF4XWqPgKyQKDg=;\r
+ b=y78DAbBHtMsSS03utD5prCV/tCsrTlMOAoYAnZPcNk6wAlfUSsrYMLGeO9mdJRLDDK\r
+ 0q5zrkUVHhcl5se9Sc4LTXL5umJWXTi4d8f9QRPHw34OJBObhYSU+0lTcrjOB7FX6at4\r
+ Da8kG+jWoB1EebL+20ZcU4hKNOWOOwOioROcF+G89+jy8BiXP05ceuc8Uhm5Yzxfg/Up\r
+ ga9q++f/3qYku5zsb9WteKeVqYOureJBcsKC9rE/79nzhgKA2x2MZl4Efgq7bOx0agXo\r
+ FbAukSQa/ZolEZcQX0DfqBHZ/5hO+TOofgUZbaL+O3uPtyA1sRXfHwsLtDVGaIsKI51Z\r
+ iQOQ==\r
+Received: by 10.204.152.12 with SMTP id e12mr8870712bkw.29.1332781442982;\r
+ Mon, 26 Mar 2012 10:04:02 -0700 (PDT)\r
+Received: from localhost ([91.144.186.21])\r
+ by mx.google.com with ESMTPS id u5sm33772259bka.5.2012.03.26.10.04.01\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Mon, 26 Mar 2012 10:04:02 -0700 (PDT)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@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+70~g06ecbeb (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Mon, 26 Mar 2012 21:02:25 +0400\r
+Message-ID: <878vinjnxa.fsf@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Mon, 26 Mar 2012 17:04:05 -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
+\r
+LGTM. Thanks for fixing this.\r
+\r
+Regards,\r
+ Dmitry\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