1 Return-Path: <amdragon@mit.edu>
\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 olra.theworths.org (Postfix) with ESMTP id 4923B431FAF
\r
6 for <notmuch@notmuchmail.org>; Mon, 10 Dec 2012 16:22:34 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id yypQy473oR6L for <notmuch@notmuchmail.org>;
\r
16 Mon, 10 Dec 2012 16:22:33 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 429B3431FAE
\r
20 for <notmuch@notmuchmail.org>; Mon, 10 Dec 2012 16:22:33 -0800 (PST)
\r
21 X-AuditID: 1209190d-b7f266d00000092b-60-50c67cc8566b
\r
22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
23 by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id D5.40.02347.8CC76C05; Mon, 10 Dec 2012 19:22:32 -0500 (EST)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qBB0MPlZ005906;
\r
27 Mon, 10 Dec 2012 19:22:27 -0500
\r
28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBB0MMUX017091
\r
32 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
\r
33 Mon, 10 Dec 2012 19:22:24 -0500 (EST)
\r
34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1TiDc6-0002XE-JO; Mon, 10 Dec 2012 19:22:22 -0500
\r
37 From: Austin Clements <aclements@csail.mit.edu>
\r
38 To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org
\r
39 Subject: Re: [PATCH 1/3] emacs: show: modify insert-part-header to save the
\r
41 In-Reply-To: <1354663662-20524-2-git-send-email-markwalters1009@gmail.com>
\r
42 References: <1354663662-20524-1-git-send-email-markwalters1009@gmail.com>
\r
43 <1354663662-20524-2-git-send-email-markwalters1009@gmail.com>
\r
44 User-Agent: Notmuch/0.14+159~g6895fee (http://notmuchmail.org) Emacs/23.4.1
\r
46 Date: Mon, 10 Dec 2012 19:22:22 -0500
\r
47 Message-ID: <87wqwpo2td.fsf@awakening.csail.mit.edu>
\r
49 Content-Type: text/plain; charset=us-ascii
\r
50 X-Brightmail-Tracker:
\r
51 H4sIAAAAAAAAA+NgFrrDIsWRmVeSWpSXmKPExsUixG6nrnui5liAwZJ2aYvVc3ksrt+cyezA
\r
52 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZfxabV2wX6Di4AaTBsYrPF2MHBwSAiYSq64L
\r
53 dDFyApliEhfurWfrYuTiEBLYxygxa+1WRghnA6PEx/cv2UGqhAQuMkn8uC4EkVjCKLGk8zYz
\r
54 SIJNQF9ixdpJrCC2iICrxNNvn5lBNggLhEtcfh4AEuYU8JLYe3sN1NB2Rok/W08wgdSICsRL
\r
55 zD7nA1LDIqAqsfz2IRYQmxfouGNvOtggbEGJkzOfgMWZBbQkbvx7yTSBUWAWktQsJKkFjEyr
\r
56 GGVTcqt0cxMzc4pTk3WLkxPz8lKLdI30cjNL9FJTSjcxggKRU5J3B+O7g0qHGAU4GJV4eCtU
\r
57 jwUIsSaWFVfmHmKU5GBSEuU9XQUU4kvKT6nMSCzOiC8qzUktPsQowcGsJMJbmguU401JrKxK
\r
58 LcqHSUlzsCiJ815JuekvJJCeWJKanZpakFoEk5Xh4FCS4A2uBmoULEpNT61Iy8wpQUgzcXCC
\r
59 DOcBGs5QAzK8uCAxtzgzHSJ/ilFRSpz3BkizAEgiozQPrheWKF4xigO9Isx7FaSKB5hk4Lpf
\r
60 AQ1mAhp8UvAwyOCSRISUVAPj+goVS2nhXNO584903LLR3vU5c8Pqk8tbmULj9Tqmm//qFuxx
\r
61 WNJ31O1HWgbXtcMhn2//O8P1IWpnpcHGezOamV34hHIKQ+7UayxLc7/XbjyreumkoG0Cj+z/
\r
62 n/49v35JVNSiY6qX+9zLHb+tuajpwnZE9SVv5KqUn6V96jHOnJMn1jiuLG1QYinOSDTUYi4q
\r
64 X-BeenThere: notmuch@notmuchmail.org
\r
65 X-Mailman-Version: 2.1.13
\r
67 List-Id: "Use and development of the notmuch mail system."
\r
68 <notmuch.notmuchmail.org>
\r
69 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
71 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
72 List-Post: <mailto:notmuch@notmuchmail.org>
\r
73 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
74 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
75 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
76 X-List-Received-Date: Tue, 11 Dec 2012 00:22:34 -0000
\r
78 On Tue, 04 Dec 2012, Mark Walters <markwalters1009@gmail.com> wrote:
\r
79 > This just make notmuch-show-insert-part-header save the basic button
\r
80 > text for parts as an attribute. This makes it simpler for the button
\r
81 > action (added in a later patch) to reword the label as appropriate (eg
\r
82 > append "(not shown)" or not as appropriate).
\r
84 > emacs/notmuch-show.el | 19 ++++++++++---------
\r
85 > 1 files changed, 10 insertions(+), 9 deletions(-)
\r
87 > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
88 > index d7fa10e..f8ce037 100644
\r
89 > --- a/emacs/notmuch-show.el
\r
90 > +++ b/emacs/notmuch-show.el
\r
91 > @@ -483,17 +483,18 @@ message at DEPTH in the current thread."
\r
92 > (fset 'notmuch-show-part-button-map notmuch-show-part-button-map)
\r
94 > (defun notmuch-show-insert-part-header (nth content-type declared-type &optional name comment)
\r
97 > + (base-label (concat (if name (concat name ": ") "")
\r
99 > + (if (not (string-equal declared-type content-type))
\r
100 > + (concat " (as " content-type ")")
\r
102 > + (or comment ""))))
\r
105 This patch is obviously fine, but if you don't mind some drive-by
\r
106 cleanup, this could be made simpler by taking advantage of how concat
\r
109 (concat (when name (concat name ": "))
\r
111 (unless (string-equal declared-type content-type)
\r
112 (concat " (as " content-type ")"))
\r
118 > - (if name (concat name ": ") "")
\r
120 > - (if (not (string-equal declared-type content-type))
\r
121 > - (concat " (as " content-type ")")
\r
123 > - (or comment "")
\r
125 > + (concat "[ " base-label " ]")
\r
126 > + :base-label base-label
\r
127 > :type 'notmuch-show-part-button-type
\r
128 > :notmuch-part nth
\r
129 > :notmuch-filename name
\r
133 > _______________________________________________
\r
134 > notmuch mailing list
\r
135 > notmuch@notmuchmail.org
\r
136 > http://notmuchmail.org/mailman/listinfo/notmuch
\r