From 511826517a5e6ec1d3691e5b0bbcbefa115b0daa Mon Sep 17 00:00:00 2001 From: Pieter Praet Date: Fri, 3 Feb 2012 11:22:25 +0100 Subject: [PATCH] Re: --- 09/fb5f7af98cc0a6db8887f8cbfdefac0a2dc5be | 119 ++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 09/fb5f7af98cc0a6db8887f8cbfdefac0a2dc5be diff --git a/09/fb5f7af98cc0a6db8887f8cbfdefac0a2dc5be b/09/fb5f7af98cc0a6db8887f8cbfdefac0a2dc5be new file mode 100644 index 000000000..db4cc5186 --- /dev/null +++ b/09/fb5f7af98cc0a6db8887f8cbfdefac0a2dc5be @@ -0,0 +1,119 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id E5A16431FAF + for ; Fri, 3 Feb 2012 02:24:30 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 0fMCXtArpIm0 for ; + Fri, 3 Feb 2012 02:24:30 -0800 (PST) +Received: from mail-ww0-f41.google.com (mail-ww0-f41.google.com + [74.125.82.41]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 2E337431FAE for ; Fri, 3 Feb 2012 02:24:30 -0800 + (PST) +Received: by wgbdt11 with SMTP id dt11so937974wgb.2 + for ; Fri, 03 Feb 2012 02:24:29 -0800 (PST) +Received: by 10.180.89.71 with SMTP id bm7mr23656549wib.20.1328264668913; + Fri, 03 Feb 2012 02:24:28 -0800 (PST) +Received: from localhost ([109.131.13.166]) + by mx.google.com with ESMTPS id l6sm5489165wiv.11.2012.02.03.02.24.27 + (version=TLSv1/SSLv3 cipher=OTHER); + Fri, 03 Feb 2012 02:24:27 -0800 (PST) +From: Pieter Praet +To: David Bremner , notmuch@notmuchmail.org +Subject: Re: +In-Reply-To: <1328155293-2334-1-git-send-email-david@tethera.net> +References: <1328064581-13949-1-git-send-email-dmitry.kurochkin@gmail.com> + <1328155293-2334-1-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.11+132~ga81001f (http://notmuchmail.org) Emacs/23.3.1 + (x86_64-unknown-linux-gnu) +Date: Fri, 03 Feb 2012 11:22:25 +0100 +Message-ID: <87r4yc2p3y.fsf@praet.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 03 Feb 2012 10:24:31 -0000 + +On Thu, 2 Feb 2012 00:01:31 -0400, David Bremner wrote: +> I rebased these against branch release (and copied a comment from +> aaron's email), but the test fails there, as does the reply within emacs test. +> + +Same issue here. + + +That mark was introduced in commit 03146f20, so isn't available in the +release branch yet. Let's just use `point-max' instead, merge 'release' +into 'master', and change it back to `mark' there. It's better to break +MML tags in the user's sig for a little while than leave this security +hole wide open. + + +Same issue wrt commit 66ecd906; the citation line should still be: + On Tue, 05 Jan 2001 15:43:57 -0000, Notmuch Test Suite wrote: +instead of: + On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite wrote: + + +Fixed patches follow, including a post-merge fix. + + +> FAIL Reply within emacs +> --- emacs.24.expected 2012-02-02 03:55:14.000000000 +0000 +> +++ emacs.24.output 2012-02-02 03:55:14.000000000 +0000 +> @@ -1,8 +1,4 @@ +> From: Notmuch Test Suite +> -To: user@example.com +> -Subject: Re: Testing message sent via SMTP +> -In-Reply-To: +> -Fcc: /home/bremner/software/upstream/notmuch/test/tmp.emacs/mail/sent +> +To: +> +Subject: +> --text follows this line-- +> -On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite wrote: +> -> This is a test that messages are sent via SMTP +> *ERROR*: Wrong type argument: integer-or-marker-p, nil +> FAIL Quote MML tags in reply +> --- emacs.25.expected 2012-02-02 03:55:15.000000000 +0000 +> +++ emacs.25.output 2012-02-02 03:55:15.000000000 +0000 +> @@ -1,7 +1,4 @@ +> From: Notmuch Test Suite +> To: +> -Subject: Re: Quote MML tags in reply +> -In-Reply-To: +> +Subject: +> --text follows this line-- +> -On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite wrote: +> -> <#!part disposition=inline> +> *ERROR*: Wrong type argument: integer-or-marker-p, nil +> +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch + + +Peace + +-- +Pieter -- 2.26.2