1 Return-Path: <markwalters1009@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by arlo.cworth.org (Postfix) with ESMTP id 9CD396DE190D
\r
6 for <notmuch@notmuchmail.org>; Sat, 7 Nov 2015 03:05:04 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.144 tagged_above=-999 required=5 tests=[AWL=0.426,
\r
12 DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7,
\r
14 RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001]
\r
16 Received: from arlo.cworth.org ([127.0.0.1])
\r
17 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
18 with ESMTP id UMwS1ysf_CEB for <notmuch@notmuchmail.org>;
\r
19 Sat, 7 Nov 2015 03:05:03 -0800 (PST)
\r
20 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com
\r
22 by arlo.cworth.org (Postfix) with ESMTPS id 870296DE17F0
\r
23 for <notmuch@notmuchmail.org>; Sat, 7 Nov 2015 03:04:49 -0800 (PST)
\r
24 Received: by wikq8 with SMTP id q8so43978010wik.1
\r
25 for <notmuch@notmuchmail.org>; Sat, 07 Nov 2015 03:04:48 -0800 (PST)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:in-reply-to:references;
\r
28 bh=9zeN5Lphq6tFQ9hVHbOwj2veV6Tf/oOYVL3aW9d7yXk=;
\r
29 b=mlFUlcHG55NVaY5S0hqwJgQOcx/VlrX0aZxAajbmyNFjb8cVvTjNIohaViNHuEYgoU
\r
30 GyXknLClggGlP1Z8EVL82KDSWMPNvYyyjrCOfVIuAdV5dfcad/xt6rnq1GYLW06skkfc
\r
31 ufFTgo0JKWAMVsvKgUXJ8l2lDuJXtZwUHHwoiLPMQiNVyOP9TJt8GZgEp8tdfAJ7RVt4
\r
32 f7PrQwasD4V4MAsOU5Fou7myiAKMZzKhwtE0+CeAM35CPz2kugludz8vx9tfUFysXbLo
\r
33 8z2gL3RX7N5CDlzKRCBgOpxZdKAbElxxDO/uwcO0f8sWKZbZV93ZS88uqc96xU/FKcIY
\r
35 X-Received: by 10.194.7.69 with SMTP id h5mr19687356wja.117.1446894288122;
\r
36 Sat, 07 Nov 2015 03:04:48 -0800 (PST)
\r
37 Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])
\r
38 by smtp.gmail.com with ESMTPSA id kr10sm4555351wjc.25.2015.11.07.03.04.46
\r
39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
40 Sat, 07 Nov 2015 03:04:47 -0800 (PST)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v4 3/7] emacs/mua: Generate improved cited text for replies
\r
44 Date: Sat, 7 Nov 2015 11:04:32 +0000
\r
45 Message-Id: <1446894276-7814-4-git-send-email-markwalters1009@gmail.com>
\r
46 X-Mailer: git-send-email 2.1.4
\r
47 In-Reply-To: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>
\r
48 References: <1446894276-7814-1-git-send-email-markwalters1009@gmail.com>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.20
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Sat, 07 Nov 2015 11:05:04 -0000
\r
63 From: David Edmondson <dme@dme.org>
\r
65 Use the message display code to generate message text to cite in
\r
68 emacs/notmuch-mua.el | 38 ++++++++------------------------------
\r
69 1 file changed, 8 insertions(+), 30 deletions(-)
\r
71 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
72 index fd98ea4..2f7abb0 100644
\r
73 --- a/emacs/notmuch-mua.el
\r
74 +++ b/emacs/notmuch-mua.el
\r
77 (eval-when-compile (require 'cl))
\r
79 -(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))
\r
80 +(declare-function notmuch-show-insert-body "notmuch-show" (msg body depth))
\r
84 @@ -142,31 +142,6 @@ (defun notmuch-mua-reply-crypto (parts)
\r
85 else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")
\r
86 do (notmuch-mua-reply-crypto (plist-get part :content))))
\r
88 -(defun notmuch-mua-get-quotable-parts (parts)
\r
89 - (loop for part in parts
\r
90 - if (notmuch-match-content-type (plist-get part :content-type) "multipart/alternative")
\r
91 - collect (let* ((subparts (plist-get part :content))
\r
92 - (types (mapcar (lambda (part) (plist-get part :content-type)) subparts))
\r
93 - (chosen-type (car (notmuch-multipart/alternative-choose types))))
\r
94 - (loop for part in (reverse subparts)
\r
95 - if (notmuch-match-content-type (plist-get part :content-type) chosen-type)
\r
97 - else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")
\r
98 - append (notmuch-mua-get-quotable-parts (plist-get part :content))
\r
99 - else if (notmuch-match-content-type (plist-get part :content-type) "text/*")
\r
102 -(defun notmuch-mua-insert-quotable-part (message part)
\r
103 - ;; We don't want text properties leaking from the show renderer into
\r
104 - ;; the reply so we use a temp buffer. Also we don't want hooks, such
\r
105 - ;; as notmuch-wash-*, to be run on the quotable part so we set
\r
106 - ;; notmuch-show-insert-text/plain-hook to nil.
\r
107 - (insert (with-temp-buffer
\r
108 - (let ((notmuch-show-insert-text/plain-hook nil))
\r
109 - ;; Show the part but do not add buttons.
\r
110 - (notmuch-show-insert-bodypart message part 0 'no-buttons))
\r
111 - (buffer-substring-no-properties (point-min) (point-max)))))
\r
113 ;; There is a bug in emacs 23's message.el that results in a newline
\r
114 ;; not being inserted after the References header, so the next header
\r
115 ;; is concatenated to the end of it. This function fixes the problem,
\r
116 @@ -245,10 +220,13 @@ (defun notmuch-mua-reply (query-string &optional sender reply-all)
\r
117 (insert "From: " from "\n")
\r
118 (insert "Date: " date "\n\n")
\r
120 - ;; Get the parts of the original message that should be quoted; this includes
\r
121 - ;; all the text parts, except the non-preferred ones in a multipart/alternative.
\r
122 - (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get original :body))))
\r
123 - (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-parts))
\r
124 + (insert (with-temp-buffer
\r
125 + ;; Don't attempt to clean up messages, excerpt
\r
126 + ;; citations, etc. in the original message before
\r
128 + (let ((notmuch-show-insert-text/plain-hook nil))
\r
129 + (notmuch-show-insert-body original (plist-get original :body) 0)
\r
130 + (buffer-substring-no-properties (point-min) (point-max)))))
\r