[PATCH v3 4/9] emacs/mua: Generate improved cited text for replies

diff --git a/6a/1a4db3f5a64ab311d44f9b7df1979aa7ee1dbf b/6a/1a4db3f5a64ab311d44f9b7df1979aa7ee1dbf
new file mode 100644 (file)
index 0000000..d55160a
--- /dev/null
+++ b/6a/1a4db3f5a64ab311d44f9b7df1979aa7ee1dbf
@@ -0,0 +1,141 @@
+Return-Path: <dme@dme.org>\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 6E689431FC7\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:38 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 2SbHk87qUGlj for <notmuch@notmuchmail.org>;\r
+       Mon, 12 May 2014 05:29:33 -0700 (PDT)\r
+Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com\r
+ [74.125.82.42])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ B6FB4431FC2   for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:32 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f42.google.com with SMTP id y10so6620213wgg.13\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:31 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\r
+       :references;\r
+       bh=k7lGn+r3PVEj5mpRiYdGS0/uH6KAbWHS3chP1tmr6Vw=;\r
+       b=QQpoJBF40LNRJ2QS+o0/1Ug+ALUBWEkxVPhcwuQUnvQ4UVljnGQNHtkZeZa+QpIAu0\r
+       gNmAkyAOtLjVUL1rkcrvQtbJ9J4GV3HRic/raWb8ARjF+wJZH3z7PRwf9JjTD5PD/r+i\r
+       agKkCGQ6AzlwHPNSyY2/dekoHge7eC/WHx87/UEH1vJxsajMzcBWR+xWZ9iizChLqDfn\r
+       +Aec+WRP/dkpawmPyN5C1qqPX38XIWQboe3BY2YD4XjTB+LRIsrFOu+JfruaEQ45ssem\r
+       pZygDVdT3ov1ZOYJHQzOjlLuoaUmfKRAHPchpxHV+R3mAerecBdRhOMNUV/xKG32Elo0\r
+       y6LQ==\r
+X-Gm-Message-State:\r
+ ALoCoQnr+eaKInQwXKlzlVRr76S6c2Cc0nxZlQcjTdz+y/NGYao2haDwpkwngsU4HmhGFT+uzoTf\r
+X-Received: by 10.180.88.129 with SMTP id bg1mr15477163wib.51.1399897771348;\r
+       Mon, 12 May 2014 05:29:31 -0700 (PDT)\r
+Received: from hotblack-desiato.hh.sledj.net (disaster-area.hh.sledj.net.\r
+       [81.149.164.25])\r
+       by mx.google.com with ESMTPSA id d6sm15890108wiz.4.2014.05.12.05.29.29\r
+       for <notmuch@notmuchmail.org>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Mon, 12 May 2014 05:29:30 -0700 (PDT)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 3F37210B328; Mon, 12 May 2014 13:29:29 +0100 (BST)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 4/9] emacs/mua: Generate improved cited text for replies\r
+Date: Mon, 12 May 2014 13:29:24 +0100\r
+Message-Id: <1399897769-26809-5-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.0.0.rc0\r
+In-Reply-To: <1399897769-26809-1-git-send-email-dme@dme.org>\r
+References: <87sixdujkv.fsf@qmul.ac.uk>\r
+       <1399897769-26809-1-git-send-email-dme@dme.org>\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, 12 May 2014 12:29:38 -0000\r
+\r
+Use the message display code to generate message text to cite in\r
+replies.\r
+---\r
+ emacs/notmuch-mua.el | 38 ++++++++------------------------------\r
+ 1 file changed, 8 insertions(+), 30 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 95e4a4d..09c922f 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -28,7 +28,7 @@\r
+ \r
+ (eval-when-compile (require 'cl))\r
+ \r
+-(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))\r
++(declare-function notmuch-show-insert-body "notmuch-show" (msg body depth))\r
+ \r
+ ;;\r
+ \r
+@@ -123,31 +123,6 @@ list."\r
+       else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")\r
+         do (notmuch-mua-reply-crypto (plist-get part :content))))\r
+ \r
+-(defun notmuch-mua-get-quotable-parts (parts)\r
+-  (loop for part in parts\r
+-      if (notmuch-match-content-type (plist-get part :content-type) "multipart/alternative")\r
+-        collect (let* ((subparts (plist-get part :content))\r
+-                      (types (mapcar (lambda (part) (plist-get part :content-type)) subparts))\r
+-                      (chosen-type (car (notmuch-multipart/alternative-choose types))))\r
+-                 (loop for part in (reverse subparts)\r
+-                       if (notmuch-match-content-type (plist-get part :content-type) chosen-type)\r
+-                       return part))\r
+-      else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")\r
+-        append (notmuch-mua-get-quotable-parts (plist-get part :content))\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
+-  ;; 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
+ ;; is concatenated to the end of it. This function fixes the problem,\r
+@@ -225,10 +200,13 @@ list."\r
+       (insert "From: " from "\n")\r
+       (insert "Date: " date "\n\n")\r
+ \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 (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-parts))\r
++      (insert (with-temp-buffer\r
++                ;; Don't attempt to clean up messages, excerpt\r
++                ;; citations, etc. in the original message before\r
++                ;; quoting.\r
++                (let ((notmuch-show-insert-text/plain-hook nil))\r
++                  (notmuch-show-insert-body original (plist-get original :body) 0)\r
++                  (buffer-substring-no-properties (point-min) (point-max)))))\r
+ \r
+       (set-mark (point))\r
+       (goto-char start)\r
+-- \r
+2.0.0.rc0\r
+\r