On Thu, 2 Feb 2012 00:01:31 -0400, David Bremner <david@tethera.net> 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 <test_suite@notmuchmail.org> wrote: instead of: On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite <test_suite@notmuchmail.org> 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 <test_suite@notmuchmail.org> > -To: user@example.com > -Subject: Re: Testing message sent via SMTP > -In-Reply-To: <XXX> > -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 <test_suite@notmuchmail.org> 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 <test_suite@notmuchmail.org> > To: > -Subject: Re: Quote MML tags in reply > -In-Reply-To: <test-emacs-mml-quoting@message.id> > +Subject: > --text follows this line-- > -On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite <test_suite@notmuchmail.org> 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