Re:

diff --git a/09/fb5f7af98cc0a6db8887f8cbfdefac0a2dc5be b/09/fb5f7af98cc0a6db8887f8cbfdefac0a2dc5be
new file mode 100644 (file)
index 0000000..db4cc51
--- /dev/null
+++ b/09/fb5f7af98cc0a6db8887f8cbfdefac0a2dc5be
@@ -0,0 +1,119 @@
+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 E5A16431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  3 Feb 2012 02:24:30 -0800 (PST)\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 0fMCXtArpIm0 for <notmuch@notmuchmail.org>;\r
+       Fri,  3 Feb 2012 02:24:30 -0800 (PST)\r
+Received: from mail-ww0-f41.google.com (mail-ww0-f41.google.com\r
+ [74.125.82.41])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 2E337431FAE   for <notmuch@notmuchmail.org>; Fri,  3 Feb 2012 02:24:30 -0800\r
+ (PST)\r
+Received: by wgbdt11 with SMTP id dt11so937974wgb.2\r
+       for <notmuch@notmuchmail.org>; Fri, 03 Feb 2012 02:24:29 -0800 (PST)\r
+Received: by 10.180.89.71 with SMTP id bm7mr23656549wib.20.1328264668913;\r
+       Fri, 03 Feb 2012 02:24:28 -0800 (PST)\r
+Received: from localhost ([109.131.13.166])\r
+       by mx.google.com with ESMTPS id l6sm5489165wiv.11.2012.02.03.02.24.27\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 03 Feb 2012 02:24:27 -0800 (PST)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re:\r
+In-Reply-To: <1328155293-2334-1-git-send-email-david@tethera.net>\r
+References: <1328064581-13949-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+       <1328155293-2334-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.11+132~ga81001f (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+Date: Fri, 03 Feb 2012 11:22:25 +0100\r
+Message-ID: <87r4yc2p3y.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: Fri, 03 Feb 2012 10:24:31 -0000\r
+\r
+On Thu,  2 Feb 2012 00:01:31 -0400, David Bremner <david@tethera.net> wrote:\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
+\r
+Same issue here.\r
+\r
+\r
+That mark was introduced in commit 03146f20, so isn't available in the\r
+release branch yet.  Let's just use `point-max' instead, merge 'release'\r
+into 'master', and change it back to `mark' there.  It's better to break\r
+MML tags in the user's sig for a little while than leave this security\r
+hole wide open.\r
+\r
+\r
+Same issue wrt commit 66ecd906;  the citation line should still be:\r
+  On Tue, 05 Jan 2001 15:43:57 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:\r
+instead of:\r
+  On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:\r
+\r
+\r
+Fixed patches follow, including a post-merge fix.\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
+\r
+\r
+Peace\r
+\r
+-- \r
+Pieter\r