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 olra.theworths.org (Postfix) with ESMTP id E2C8A429E4E
\r
6 for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 00:15:51 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id Soyd-+YTyNTq for <notmuch@notmuchmail.org>;
\r
18 Sat, 15 Dec 2012 00:15:50 -0800 (PST)
\r
19 Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com
\r
20 [74.125.82.47]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
21 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
22 6BA1E429E28 for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 00:15:46 -0800
\r
24 Received: by mail-wg0-f47.google.com with SMTP id dq11so1718343wgb.2
\r
25 for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 00:15:45 -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:x-mailer:in-reply-to:references;
\r
28 bh=5vb6CyBisLOmviPNatjbE5QC/29AGGUx0rviqPS9+xI=;
\r
29 b=0IOzS6XELkjSaszewzWvz2ealvuSP15gnwfe5q2RpFDOV4nQ2mTBSzvUwPTLvgiW52
\r
30 vjVPcJL0Zw8ktlUWC/4cuQ8S/tq87+s4XG9P3Fr/RTsnfUZLxKNyJLn9anPJljrRgWoN
\r
31 dAvCCyVYHYl9KdmKMmaCABQ+g3KKJxnxZriYzSQq3FAA70Ibe0H66dmlKkF8ldq9rXMR
\r
32 VJemtJwG5Ln0PKFrsfpwL3by/Zzf4fbp0+2O9oHdF+3/WAYBLls9AJfn3OLMZxlsU857
\r
33 hvMRZUl/aaQ344HbFCqeqM/sEWXoZXqJPGfFulQANeXdgqKVs4hqzWYq4K3+hf9btePg
\r
35 Received: by 10.194.5.74 with SMTP id q10mr7571431wjq.13.1355559344048;
\r
36 Sat, 15 Dec 2012 00:15:44 -0800 (PST)
\r
37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])
\r
38 by mx.google.com with ESMTPS id w5sm947169wif.11.2012.12.15.00.15.42
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Sat, 15 Dec 2012 00:15:43 -0800 (PST)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH v3 1/5] emacs: show: modify insert-part-header to save the
\r
45 Date: Sat, 15 Dec 2012 08:15:33 +0000
\r
46 Message-Id: <1355559338-14313-2-git-send-email-markwalters1009@gmail.com>
\r
47 X-Mailer: git-send-email 1.7.9.1
\r
48 In-Reply-To: <1355559338-14313-1-git-send-email-markwalters1009@gmail.com>
\r
49 References: <1355559338-14313-1-git-send-email-markwalters1009@gmail.com>
\r
50 X-BeenThere: notmuch@notmuchmail.org
\r
51 X-Mailman-Version: 2.1.13
\r
53 List-Id: "Use and development of the notmuch mail system."
\r
54 <notmuch.notmuchmail.org>
\r
55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
56 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
58 List-Post: <mailto:notmuch@notmuchmail.org>
\r
59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
62 X-List-Received-Date: Sat, 15 Dec 2012 08:15:53 -0000
\r
64 This just make notmuch-show-insert-part-header save the basic button
\r
65 text for parts as an attribute. This makes it simpler for the button
\r
66 action (added in a later patch) to reword the label as appropriate (eg
\r
67 append "(not shown)" or not as appropriate).
\r
69 emacs/notmuch-show.el | 18 +++++++++---------
\r
70 1 files changed, 9 insertions(+), 9 deletions(-)
\r
72 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
73 index d7fa10e..06f7ca5 100644
\r
74 --- a/emacs/notmuch-show.el
\r
75 +++ b/emacs/notmuch-show.el
\r
76 @@ -483,17 +483,17 @@ message at DEPTH in the current thread."
\r
77 (fset 'notmuch-show-part-button-map notmuch-show-part-button-map)
\r
79 (defun notmuch-show-insert-part-header (nth content-type declared-type &optional name comment)
\r
82 + (base-label (concat (when name (concat name ": "))
\r
84 + (unless (string-equal declared-type content-type)
\r
85 + (concat " (as " content-type ")"))
\r
91 - (if name (concat name ": ") "")
\r
93 - (if (not (string-equal declared-type content-type))
\r
94 - (concat " (as " content-type ")")
\r
98 + (concat "[ " base-label " ]")
\r
99 + :base-label base-label
\r
100 :type 'notmuch-show-part-button-type
\r
102 :notmuch-filename name
\r