Re: Possible bug: wrong from address when forwarding

diff --git a/b9/091ddf88e411e34ccefa15ae0b88ce9a9904c5 b/b9/091ddf88e411e34ccefa15ae0b88ce9a9904c5
new file mode 100644 (file)
index 0000000..0b1532a
--- /dev/null
+++ b/b9/091ddf88e411e34ccefa15ae0b88ce9a9904c5
@@ -0,0 +1,81 @@
+Return-Path: <pieter@praet.org>\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 E6DC6431FD0\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Jul 2011 08:53:58 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 9S8DQEegDSVK for <notmuch@notmuchmail.org>;\r
+       Sat,  2 Jul 2011 08:53:58 -0700 (PDT)\r
+Received: from mail-wy0-f181.google.com (mail-wy0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 55DA1431FB6\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Jul 2011 08:53:58 -0700 (PDT)\r
+Received: by wyh22 with SMTP id 22so3100699wyh.26\r
+       for <notmuch@notmuchmail.org>; Sat, 02 Jul 2011 08:53:56 -0700 (PDT)\r
+Received: by 10.216.235.33 with SMTP id t33mr3829546weq.6.1309622036853;\r
+       Sat, 02 Jul 2011 08:53:56 -0700 (PDT)\r
+Received: from localhost (91.216-242-81.adsl-dyn.isp.belgacom.be\r
+       [81.242.216.91])\r
+       by mx.google.com with ESMTPS id w62sm2109826wec.18.2011.07.02.08.53.55\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 02 Jul 2011 08:53:56 -0700 (PDT)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: Possible bug: wrong from address when forwarding\r
+In-Reply-To: <BANLkTi=uUqGLNeTGriKqDKex6AuUjYzYOQ@mail.gmail.com>\r
+References: <BANLkTi=uUqGLNeTGriKqDKex6AuUjYzYOQ@mail.gmail.com>\r
+User-Agent: Notmuch/0.5-315-g34bd5eb (http://notmuchmail.org) Emacs/23.1.50.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 02 Jul 2011 17:53:53 +0200\r
+Message-ID: <87oc1cn0fi.fsf@praet.org>\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: Sat, 02 Jul 2011 15:53:59 -0000\r
+\r
+\r
+---\r
+Either enable `notmuch-always-prompt-for-sender', or apply this\r
+quick-fix patch, which uses `name' and `primary_email' as configured\r
+in your .notmuch-config if aforementioned isn't enabled.\r
+\r
+ emacs/notmuch-mua.el |    4 +++-\r
+ 1 files changed, 3 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 274c5da..27c6884 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -213,7 +213,9 @@ the From: address first."\r
+             (user-full-name (car address-components))\r
+             (user-mail-address (cadr address-components)))\r
+        (notmuch-mua-forward-message))\r
+-    (notmuch-mua-forward-message)))\r
++    (let* ((user-full-name (notmuch-user-name))\r
++           (user-mail-address (notmuch-user-primary-email)))\r
++    (notmuch-mua-forward-message))))\r
+ \r
+ (defun notmuch-mua-new-reply (query-string &optional prompt-for-sender)\r
+   "Invoke the notmuch reply window."\r
+-- \r
+1.7.5.4\r