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 0E4716DE186E
\r
6 for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:25:11 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.283 tagged_above=-999 required=5 tests=[AWL=0.287,
\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 KwlUwZnwpGm9 for <notmuch@notmuchmail.org>;
\r
19 Sat, 20 Feb 2016 10:25:08 -0800 (PST)
\r
20 Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com
\r
21 [74.125.82.42]) by arlo.cworth.org (Postfix) with ESMTPS id 0C6006DE186C for
\r
22 <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:55 -0800 (PST)
\r
23 Received: by mail-wm0-f42.google.com with SMTP id g62so119129683wme.1
\r
24 for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:54 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:in-reply-to:references;
\r
27 bh=Oa1bBgWhvxxDZGvg9PjJ39rYAjQJGHx+HY3GdEhy1Kk=;
\r
28 b=iElZIO6fsUUkFGVa6UQnazdP8ZoPEUUx4M8B6ADEmtnStEQpPG4jNiNhKkH02pxwk0
\r
29 JboaAo/WxKFPJUA6xW5NNQmYwf1JKhSncl2hlbVR86qM9XfOSpdQsccLS7aCr3X/7zKl
\r
30 CkMu3nTbFwK9YcIIo9oj1ErfolU4k4++axQg0/XFOw6WXrVoWHnqmHpX9/rm2DiBi7Dc
\r
31 8hce/c532ShSBa1KnEOfwgewy93St37wRcYYNJVPiye61Qvtf2Gi3Y9P48p3BziaaUKT
\r
32 VkkGgaFXZZzsQBk8xUYsZ8Ff7IWUXo+7xo8MjbkkSiD1RraI0HPoIJD/uYmgZWM2BhCf
\r
34 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
35 d=1e100.net; s=20130820;
\r
36 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
\r
38 bh=Oa1bBgWhvxxDZGvg9PjJ39rYAjQJGHx+HY3GdEhy1Kk=;
\r
39 b=Wy1WCOKXbpumcCPgbrdjIdp5jzf+bNQxN500bFJEmUlAZMT/x9ah0pAjSSbFRmVqut
\r
40 ThQ7nQAlNvQZbWitMh7tMzH6sz4ZVDhOxRMR2+q+mVnOkZ9bsPpJsHDy6HlWg+m16dxE
\r
41 dO1QOt8yJAZld/iRVNUtz3K0++QAH91kIQCq8lKt3SSczO2yQpxcwyo++euzi0qwCggn
\r
42 n5XeCBmuV2rt5AT/Sj8MYk3SmqQ50a4BdyxYEz9H7IjT9omF3DH4H3kQUKfX//Qs4PB+
\r
43 NswKJ2XkcWS4ixtho3ilS9MVI8SQlHCjiLvKlErfjh47pgs3334B1A4QKrg8fm600EyM
\r
46 AG10YOQ2l2kwzUOo3rsIhJwFI8pK4COFGmBaa8AyaXrD13UYW+J0miBdsQ+3G07c+MTT/Q==
\r
47 X-Received: by 10.28.72.132 with SMTP id v126mr3918786wma.88.1455992693789;
\r
48 Sat, 20 Feb 2016 10:24:53 -0800 (PST)
\r
49 Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])
\r
50 by smtp.gmail.com with ESMTPSA id 77sm2614777wmp.18.2016.02.20.10.24.52
\r
51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
52 Sat, 20 Feb 2016 10:24:53 -0800 (PST)
\r
53 From: Mark Walters <markwalters1009@gmail.com>
\r
54 To: notmuch@notmuchmail.org
\r
55 Subject: [PATCH v6 4/6] emacs/mua: Generate improved cited text for replies
\r
56 Date: Sat, 20 Feb 2016 18:24:38 +0000
\r
57 Message-Id: <1455992680-24978-5-git-send-email-markwalters1009@gmail.com>
\r
58 X-Mailer: git-send-email 2.1.4
\r
59 In-Reply-To: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>
\r
60 References: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>
\r
61 X-BeenThere: notmuch@notmuchmail.org
\r
62 X-Mailman-Version: 2.1.20
\r
64 List-Id: "Use and development of the notmuch mail system."
\r
65 <notmuch.notmuchmail.org>
\r
66 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
68 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
69 List-Post: <mailto:notmuch@notmuchmail.org>
\r
70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
71 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
72 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
73 X-List-Received-Date: Sat, 20 Feb 2016 18:25:11 -0000
\r
75 From: David Edmondson <dme@dme.org>
\r
77 Use the message display code to generate message text to cite in
\r
80 For now we set insert-headers-p function to
\r
81 notmuch-show-reply-insert-header-p-never so that, as before, we don't
\r
82 insert part buttons.
\r
84 With that choice of insert-headers-p function there is only one
\r
85 failing test: this test has a text part (an email message) listed as
\r
86 application/octet-stream. Notmuch show displays this part, but the
\r
87 reply code omitted it as it had type application/octet-stream. The new
\r
88 code correctly includes it. Thus update the expected output to match.
\r
90 emacs/notmuch-mua.el | 43 +++++++++++++------------------------------
\r
91 test/T310-emacs.sh | 32 ++++++++++++++++++++++++++++++++
\r
92 2 files changed, 45 insertions(+), 30 deletions(-)
\r
94 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
95 index d4fad7b..ecc5bec 100644
\r
96 --- a/emacs/notmuch-mua.el
\r
97 +++ b/emacs/notmuch-mua.el
\r
100 (eval-when-compile (require 'cl))
\r
102 -(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))
\r
103 +(declare-function notmuch-show-insert-body "notmuch-show" (msg body depth))
\r
104 (declare-function notmuch-fcc-header-setup "notmuch-maildir-fcc" ())
\r
105 (declare-function notmuch-fcc-handler "notmuch-maildir-fcc" (destdir))
\r
107 @@ -144,31 +144,6 @@ (defun notmuch-mua-reply-crypto (parts)
\r
108 else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")
\r
109 do (notmuch-mua-reply-crypto (plist-get part :content))))
\r
111 -(defun notmuch-mua-get-quotable-parts (parts)
\r
112 - (loop for part in parts
\r
113 - if (notmuch-match-content-type (plist-get part :content-type) "multipart/alternative")
\r
114 - collect (let* ((subparts (plist-get part :content))
\r
115 - (types (mapcar (lambda (part) (plist-get part :content-type)) subparts))
\r
116 - (chosen-type (car (notmuch-multipart/alternative-choose types))))
\r
117 - (loop for part in (reverse subparts)
\r
118 - if (notmuch-match-content-type (plist-get part :content-type) chosen-type)
\r
120 - else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")
\r
121 - append (notmuch-mua-get-quotable-parts (plist-get part :content))
\r
122 - else if (notmuch-match-content-type (plist-get part :content-type) "text/*")
\r
125 -(defun notmuch-mua-insert-quotable-part (message part)
\r
126 - ;; We don't want text properties leaking from the show renderer into
\r
127 - ;; the reply so we use a temp buffer. Also we don't want hooks, such
\r
128 - ;; as notmuch-wash-*, to be run on the quotable part so we set
\r
129 - ;; notmuch-show-insert-text/plain-hook to nil.
\r
130 - (insert (with-temp-buffer
\r
131 - (let ((notmuch-show-insert-text/plain-hook nil))
\r
132 - ;; Show the part but do not add buttons.
\r
133 - (notmuch-show-insert-bodypart message part 0 'no-buttons))
\r
134 - (buffer-substring-no-properties (point-min) (point-max)))))
\r
136 ;; There is a bug in emacs 23's message.el that results in a newline
\r
137 ;; not being inserted after the References header, so the next header
\r
138 ;; is concatenated to the end of it. This function fixes the problem,
\r
139 @@ -247,10 +222,18 @@ (defun notmuch-mua-reply (query-string &optional sender reply-all)
\r
140 (insert "From: " from "\n")
\r
141 (insert "Date: " date "\n\n")
\r
143 - ;; Get the parts of the original message that should be quoted; this includes
\r
144 - ;; all the text parts, except the non-preferred ones in a multipart/alternative.
\r
145 - (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get original :body))))
\r
146 - (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-parts))
\r
147 + (insert (with-temp-buffer
\r
149 + ;; Don't attempt to clean up messages, excerpt
\r
150 + ;; citations, etc. in the original message before
\r
152 + ((notmuch-show-insert-text/plain-hook nil)
\r
153 + ;; Don't omit long parts.
\r
154 + (notmuch-show-max-text-part-size 0)
\r
155 + ;; Insert headers for parts as appropriate for replying.
\r
156 + (notmuch-show-insert-header-p-function #'notmuch-show-reply-insert-header-p-never))
\r
157 + (notmuch-show-insert-body original (plist-get original :body) 0)
\r
158 + (buffer-substring-no-properties (point-min) (point-max)))))
\r
162 diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
\r
163 index 61bc369..22ca71c 100755
\r
164 --- a/test/T310-emacs.sh
\r
165 +++ b/test/T310-emacs.sh
\r
166 @@ -473,6 +473,38 @@ Alex Botero-Lowry <alex.boterolowry@gmail.com> writes:
\r
167 > and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically
\r
170 +> From e3bc4bbd7b9d0d086816ab5f8f2d6ffea1dd3ea4 Mon Sep 17 00:00:00 2001
\r
171 +> From: Alexander Botero-Lowry <alex.boterolowry@gmail.com>
\r
172 +> Date: Tue, 17 Nov 2009 11:30:39 -0800
\r
173 +> Subject: [PATCH] Deal with situation where sysconf(_SC_GETPW_R_SIZE_MAX) returns -1
\r
176 +> notmuch-config.c | 2 ++
\r
177 +> 1 files changed, 2 insertions(+), 0 deletions(-)
\r
179 +> diff --git a/notmuch-config.c b/notmuch-config.c
\r
180 +> index 248149c..e7220d8 100644
\r
181 +> --- a/notmuch-config.c
\r
182 +> +++ b/notmuch-config.c
\r
183 +> @@ -77,6 +77,7 @@ static char *
\r
184 +> get_name_from_passwd_file (void *ctx)
\r
186 +> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);
\r
187 +> + if (pw_buf_size == -1) pw_buf_size = 64;
\r
188 +> char *pw_buf = talloc_zero_size (ctx, pw_buf_size);
\r
189 +> struct passwd passwd, *ignored;
\r
191 +> @@ -101,6 +102,7 @@ static char *
\r
192 +> get_username_from_passwd_file (void *ctx)
\r
194 +> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);
\r
195 +> + if (pw_buf_size == -1) pw_buf_size = 64;
\r
196 +> char *pw_buf = talloc_zero_size (ctx, pw_buf_size);
\r
197 +> struct passwd passwd, *ignored;
\r
202 > _______________________________________________
\r
203 > notmuch mailing list
\r
204 > notmuch@notmuchmail.org
\r