(no commit message)

diff --git a/cd/3e9c47dc8a9583362f1f65f066d01935697d5d b/cd/3e9c47dc8a9583362f1f65f066d01935697d5d
new file mode 100644 (file)
index 0000000..7d9551b
--- /dev/null
+++ b/cd/3e9c47dc8a9583362f1f65f066d01935697d5d
@@ -0,0 +1,85 @@
+Return-Path: <bremner@tethera.net>\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 DE94C431FAF\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Feb 2012 20:01:51 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[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 AlJG+U9NIsSx for <notmuch@notmuchmail.org>;\r
+       Wed,  1 Feb 2012 20:01:48 -0800 (PST)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\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 E9271431FAE\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Feb 2012 20:01:47 -0800 (PST)\r
+Received: from zancas.localnet\r
+       (fctnnbsc36w-156034071197.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [156.34.71.197]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q1241k4M010863\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO)\r
+       for <notmuch@notmuchmail.org>; Thu, 2 Feb 2012 00:01:46 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.77)\r
+       (envelope-from <bremner@tethera.net>) id 1Rsnrl-0003id-P5\r
+       for notmuch@notmuchmail.org; Thu, 02 Feb 2012 00:01:45 -0400\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: \r
+Date: Thu,  2 Feb 2012 00:01:31 -0400\r
+Message-Id: <1328155293-2334-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1328064581-13949-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1328064581-13949-1-git-send-email-dmitry.kurochkin@gmail.com>\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: Thu, 02 Feb 2012 04:01:52 -0000\r
+\r
+I rebased these against branch release (and copied a comment from\r
+aaron's email), but the test fails there, as does the reply within emacs test.\r
+\r
+FAIL   Reply within emacs\r
+       --- emacs.24.expected   2012-02-02 03:55:14.000000000 +0000\r
+       +++ emacs.24.output     2012-02-02 03:55:14.000000000 +0000\r
+       @@ -1,8 +1,4 @@\r
+        From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+       -To: user@example.com\r
+       -Subject: Re: Testing message sent via SMTP\r
+       -In-Reply-To: <XXX>\r
+       -Fcc: /home/bremner/software/upstream/notmuch/test/tmp.emacs/mail/sent\r
+       +To: \r
+       +Subject: \r
+        --text follows this line--\r
+       -On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:\r
+       -> This is a test that messages are sent via SMTP\r
+*ERROR*: Wrong type argument: integer-or-marker-p, nil\r
+ FAIL   Quote MML tags in reply\r
+       --- emacs.25.expected   2012-02-02 03:55:15.000000000 +0000\r
+       +++ emacs.25.output     2012-02-02 03:55:15.000000000 +0000\r
+       @@ -1,7 +1,4 @@\r
+        From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+        To: \r
+       -Subject: Re: Quote MML tags in reply\r
+       -In-Reply-To: <test-emacs-mml-quoting@message.id>\r
+       +Subject: \r
+        --text follows this line--\r
+       -On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:\r
+       -> <#!part disposition=inline>\r
+*ERROR*: Wrong type argument: integer-or-marker-p, nil\r
+\r
+\r