Re: [PATCH] emacs: fix MML quoting in replies

diff --git a/b0/1e97e1ac2179cf0fa0f04aced0e573c2139dc5 b/b0/1e97e1ac2179cf0fa0f04aced0e573c2139dc5
new file mode 100644 (file)
index 0000000..7e09d47
--- /dev/null
+++ b/b0/1e97e1ac2179cf0fa0f04aced0e573c2139dc5
@@ -0,0 +1,101 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 7D31E431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  4 Mar 2012 16:39:33 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, 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 6CQr2wuHl3pm for <notmuch@notmuchmail.org>;\r
+       Sun,  4 Mar 2012 16:39:33 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\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 E1843431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  4 Mar 2012 16:39:32 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1S4Lxb-00021l-2Q; Mon, 05 Mar 2012 00:39:31 +0000\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1S4Lxa-0002NZ-QE; Mon, 05 Mar 2012 00:39:30 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: fix MML quoting in replies\r
+In-Reply-To: <1330849538-24558-1-git-send-email-jani@nikula.org>\r
+References: <87fwdptbir.fsf@dehydrator.spatula.rdu.redhat.com>\r
+       <1330849538-24558-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.11.1+295~gfd64f6e (http://notmuchmail.org) Emacs/23.2.1\r
+       (i486-pc-linux-gnu)\r
+Date: Mon, 05 Mar 2012 00:41:22 +0000\r
+Message-ID: <877gyz6frh.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: ecd84b6a092eebfba0a91029473f3807 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+       *      domain\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Mon, 05 Mar 2012 00:39:33 -0000\r
+\r
+On Sun,  4 Mar 2012 10:25:38 +0200, Jani Nikula <jani@nikula.org> wrote:\r
+> The reply MML quoting added in commit ae438cc unintentionally MML\r
+> quotes also the signature/encryption MML tags added via\r
+> message-setup-hook, causing the reply not to be signed/encrypted.\r
+> \r
+> MML quote just the original message in the temp buffer before\r
+> inserting it to the message buffer, to not interfere with message mode\r
+> hooks or message construction in general.\r
+> \r
+> See [1] and [2] for bug reports.\r
+> \r
+> Thanks to Tim Bielawa <tbielawa@redhat.com> for testing.\r
+> \r
+> [1] id:"87hay78x6l.fsf@wyzanski.jamesvasile.com"\r
+> [2] id:"1330812262-28272-1-git-send-email-tbielawa@redhat.com".\r
+\r
+\r
+LGTM (but I am not really a lisper). I don't sign messages so haven't\r
+tested it but it seems "correct" to only mml-quote the actual body\r
+(i.e. the bit that comes from someone else).\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r