Re: [PATCH 2/2] emacs: Correctly quote non-text/plain parts in reply

diff --git a/62/d401d07fe2572a820d33a6d4b1afd960b63710 b/62/d401d07fe2572a820d33a6d4b1afd960b63710
new file mode 100644 (file)
index 0000000..b1949d4
--- /dev/null
+++ b/62/d401d07fe2572a820d33a6d4b1afd960b63710
@@ -0,0 +1,165 @@
+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 37C2C431FAF\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 01:10:43 -0700 (PDT)\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 uQpihxlSZPYD for <notmuch@notmuchmail.org>;\r
+       Sun, 22 Apr 2012 01:10:42 -0700 (PDT)\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 511EF431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 01:10:42 -0700 (PDT)\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 1SLrsW-0002Jf-GX; Sun, 22 Apr 2012 09:10:40 +0100\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 1SLrsW-0000RR-5S; Sun, 22 Apr 2012 09:10:40 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Adam Wolfe Gordon <awg+notmuch@xvx.ca>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/2] emacs: Correctly quote non-text/plain parts in reply\r
+In-Reply-To: <1335056093-17621-3-git-send-email-awg+notmuch@xvx.ca>\r
+References: <1335056093-17621-1-git-send-email-awg+notmuch@xvx.ca>\r
+       <1335056093-17621-3-git-send-email-awg+notmuch@xvx.ca>\r
+User-Agent: Notmuch/0.12+110~gbc97b4a (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 22 Apr 2012 09:10:59 +0100\r
+Message-ID: <87hawcuqy4.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: a7785dd892df14389f9af2d32dbb5335 (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: Sun, 22 Apr 2012 08:10:43 -0000\r
+\r
+On Sun, 22 Apr 2012, Adam Wolfe Gordon <awg+notmuch@xvx.ca> wrote:\r
+> Quote non-text parts nicely by displaying them with mm-display-part\r
+> before calling message-cite-original to quote them. HTML-only emails\r
+> can now be quoted correctly.\r
+\r
+My instinct would have been to do this with a temporary buffer rather\r
+than the narrowing but I am *definitely* too much of a lisp beginner to\r
+say that either is better.\r
+\r
+(I think notmuch-show-mm-display-part-inline uses the temporary buffer\r
+approach.)\r
+\r
+Anyway, as it is, it looks correct and seems to work! (and is obviously\r
+useful functionality)\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+> Mark the test for this feature as not broken.\r
+> ---\r
+>  emacs/notmuch-mua.el |   20 +++++++++++++++-----\r
+>  test/emacs           |    1 -\r
+>  2 files changed, 15 insertions(+), 6 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+> index 87bd88d..f7af789 100644\r
+> --- a/emacs/notmuch-mua.el\r
+> +++ b/emacs/notmuch-mua.el\r
+> @@ -21,6 +21,7 @@\r
+>  \r
+>  (require 'json)\r
+>  (require 'message)\r
+> +(require 'mm-view)\r
+>  (require 'format-spec)\r
+>  \r
+>  (require 'notmuch-lib)\r
+> @@ -90,6 +91,19 @@ list."\r
+>      else if (notmuch-match-content-type (plist-get part :content-type) "text/*")\r
+>        collect part))\r
+>  \r
+> +(defun notmuch-mua-insert-quotable-part (message part)\r
+> +  (save-restriction\r
+> +    (narrow-to-region (point) (point))\r
+> +    (insert (notmuch-get-bodypart-content message part\r
+> +                                      (plist-get part :id)\r
+> +                                      notmuch-show-process-crypto))\r
+> +    (let ((handle (mm-make-handle (current-buffer)\r
+> +                              (list (plist-get part :content-type))))\r
+> +      (end-of-orig (point-max)))\r
+> +      (mm-display-part handle)\r
+> +      (kill-region (point-min) end-of-orig))\r
+> +    (goto-char (point-max))))\r
+> +\r
+>  ;; There is a bug in emacs 23's message.el that results in a newline\r
+>  ;; not being inserted after the References header, so the next header\r
+>  ;; is concatenated to the end of it. This function fixes the problem,\r
+> @@ -169,11 +183,7 @@ list."\r
+>      ;; Get the parts of the original message that should be quoted; this includes\r
+>      ;; all the text parts, except the non-preferred ones in a multipart/alternative.\r
+>      (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get original :body))))\r
+> -      (mapc (lambda (part)\r
+> -              (insert (notmuch-get-bodypart-content original part\r
+> -                                                    (plist-get part :id)\r
+> -                                                    notmuch-show-process-crypto)))\r
+> -            quotable-parts))\r
+> +      (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-parts))\r
+>  \r
+>      (set-mark (point))\r
+>      (goto-char start)\r
+> diff --git a/test/emacs b/test/emacs\r
+> index e648f80..579844f 100755\r
+> --- a/test/emacs\r
+> +++ b/test/emacs\r
+> @@ -445,7 +445,6 @@ EOF\r
+>  test_expect_equal_file OUTPUT EXPECTED\r
+>  \r
+>  test_begin_subtest "Reply within emacs to an html-only message"\r
+> -test_subtest_known_broken\r
+>  add_message '[content-type]="text/html"' \\r
+>          '[body]="Hi,<br />This is an <b>HTML</b> test message.<br /><br />OK?"'\r
+>  test_emacs "(let ((message-hidden-headers '()))\r
+> -- \r
+> 1.7.5.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r