Re: [PATCH v2] emacs: insert quotable parts in reply as they are displayed in show...

diff --git a/a1/0be5d72e90dc28f135e4820042089d7b868aa7 b/a1/0be5d72e90dc28f135e4820042089d7b868aa7
new file mode 100644 (file)
index 0000000..4095577
--- /dev/null
+++ b/a1/0be5d72e90dc28f135e4820042089d7b868aa7
@@ -0,0 +1,121 @@
+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 30161431FB6\r
+       for <notmuch@notmuchmail.org>; Sun,  1 Sep 2013 07:54:41 -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 Vsto+rcqyeL3 for <notmuch@notmuchmail.org>;\r
+       Sun,  1 Sep 2013 07:54:34 -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 39199431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  1 Sep 2013 07:54:34 -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 1VG92q-0000hU-M6; Sun, 01 Sep 2013 15:54:29 +0100\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1VG92q-0001FX-A5; Sun, 01 Sep 2013 15:54:28 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] emacs: insert quotable parts in reply as they are\r
+       displayed in show view\r
+In-Reply-To: <87ppsvp1i9.fsf@qmul.ac.uk>\r
+References: <1377633044-22044-1-git-send-email-jani@nikula.org>\r
+       <1377791611-29506-1-git-send-email-jani@nikula.org>\r
+       <87ppsvp1i9.fsf@qmul.ac.uk>\r
+User-Agent: Notmuch/0.15.2+269~g01f5508 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 01 Sep 2013 15:54:27 +0100\r
+Message-ID: <87eh98twws.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 2f39fcaafe68e7cdf253f1ca72370508 (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\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 0.0 points. Summary of the scoring: \r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.0 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\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, 01 Sep 2013 14:54:41 -0000\r
+\r
+\r
+Here is a slightly better (I think) version of this. If we use a\r
+temp-buffer we don't need the narrowing or point movement as the insert\r
+buffer-string should get that right.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+>From d0925d374411cf5031832f4d72b6fb5d21a45b21 Mon Sep 17 00:00:00 2001\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+Date: Fri, 30 Aug 2013 17:43:46 +0100\r
+Subject: [PATCH] tweak\r
+\r
+---\r
+ emacs/notmuch-mua.el |   17 +++++++++--------\r
+ 1 files changed, 9 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index e7cc94e..ff8149b 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -130,14 +130,15 @@ list."\r
+         collect part))\r
+ \r
+ (defun notmuch-mua-insert-quotable-part (message part)\r
+-  (save-restriction\r
+-    (narrow-to-region (point-min) (point))\r
+-    ;; We don't want hooks, such as notmuch-wash-*, to be run on the\r
+-    ;; quotable part.\r
+-    (let ((notmuch-show-insert-text/plain-hook nil))\r
+-      ;; Show the part but do not add buttons.\r
+-      (notmuch-show-insert-bodypart message part 0 'no-buttons))\r
+-    (goto-char (point-max))))\r
++  ;; We don't want text properties leaking from the show renderer into\r
++  ;; the reply so we use a temp buffer. Also we don't want hooks, such\r
++  ;; as notmuch-wash-*, to be run on the quotable part so we set\r
++  ;; notmuch-show-insert-text/plain-hook to nil.\r
++  (insert (with-temp-buffer\r
++          (let ((notmuch-show-insert-text/plain-hook nil))\r
++            ;; Show the part but do not add buttons.\r
++            (notmuch-show-insert-bodypart message part 0 'no-buttons))\r
++          (buffer-substring-no-properties (point-min) (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
+-- \r
+1.7.9.1\r
+\r