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 985B76DE1AC9
\r
6 for <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:26 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.246 tagged_above=-999 required=5 tests=[AWL=0.324,
\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 b5tEXwp5bzlt for <notmuch@notmuchmail.org>;
\r
19 Sun, 14 Feb 2016 10:40:24 -0800 (PST)
\r
20 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com
\r
21 [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id 5AA0B6DE178F for
\r
22 <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:21 -0800 (PST)
\r
23 Received: by mail-wm0-f66.google.com with SMTP id c200so12198355wme.0
\r
24 for <notmuch@notmuchmail.org>; Sun, 14 Feb 2016 10:40:21 -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=kFeY4ZGuadODd7xi/GwwU2A3lRHUI5qALY2L6Gt+GLQ=;
\r
28 b=A/kq1aZ8yeBCqFh+tYYeP8nfekfLYz0NQIhstIfA8hX6E+9s51bkJypjPi7+At0f8b
\r
29 NWPwmpkhF3D+upRij9gf+Q1s1es1MgFmPybiWQhp9V7CSo0PWM4sN+q/gqg6y0ihfiXO
\r
30 jjGBRnzqQkKDxYAQChsqSt3EqYpm0jzM+hm1NvJ6LqZ3nOT9OmB1C84X2078ZQPWeKc4
\r
31 +pyBLCSfdTbCm7JtztiyJw6mej16VjpPMaw59j7J3/z3szHIHJrHE1bYtWQUaCsUvQm9
\r
32 G4yLJCI0VeK3oHNigFmNZe3gJIBfeW5pHyAVC2qIRh0qolq8hQLMg0rd1D46Aluc2ZQH
\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=kFeY4ZGuadODd7xi/GwwU2A3lRHUI5qALY2L6Gt+GLQ=;
\r
39 b=OmVZCBJuPl1VcWLFzQzBmHEJCJMA8CKnnQ4JmzrBozdY9pXiVJyzmSkjCQDaVMU0b6
\r
40 5Y89uiNHJjsROoFU/8huQ6jSL9d7h/m4+rg8+74pTG2N19JjrULTNmz5n2iLEv79TBve
\r
41 WBPVCeD35qqoc+XooYrf0g8HWa3S24Bl+MdRVURvf5931cpLvqmo5RHhOgwc8dp3uSNy
\r
42 h3VADjb3OwHO2Hm5Sv24qXZRmA1LFU5Qu2pLP3hz8Us5ASvK0PjMgLt+Q+tQ338fYpPf
\r
43 lNdc3aufuDY/ZipcS0X1vdrcy09fJsqwyfFSs6yYX97o1RcmzUCNiCU+sEgHLzqVGhAV
\r
46 AG10YORIty2zY/7tdelPMQnMUMuy2HD6vrkNiChAst+vUjYYQ0ePYPljnzgvEUWrLmkveQ==
\r
47 X-Received: by 10.28.221.68 with SMTP id u65mr8852256wmg.95.1455475220083;
\r
48 Sun, 14 Feb 2016 10:40:20 -0800 (PST)
\r
49 Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])
\r
50 by smtp.gmail.com with ESMTPSA id v66sm12004978wmb.18.2016.02.14.10.40.19
\r
51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
52 Sun, 14 Feb 2016 10:40:19 -0800 (PST)
\r
53 From: Mark Walters <markwalters1009@gmail.com>
\r
54 To: notmuch@notmuchmail.org
\r
55 Subject: [PATCH v5 4/7] emacs/show: Remove the 'no-buttons option of
\r
56 `notmuch-show-insert-bodypart'
\r
57 Date: Sun, 14 Feb 2016 18:39:56 +0000
\r
58 Message-Id: <1455475199-32622-5-git-send-email-markwalters1009@gmail.com>
\r
59 X-Mailer: git-send-email 2.1.4
\r
60 In-Reply-To: <1455475199-32622-1-git-send-email-markwalters1009@gmail.com>
\r
61 References: <1455475199-32622-1-git-send-email-markwalters1009@gmail.com>
\r
62 X-BeenThere: notmuch@notmuchmail.org
\r
63 X-Mailman-Version: 2.1.20
\r
65 List-Id: "Use and development of the notmuch mail system."
\r
66 <notmuch.notmuchmail.org>
\r
67 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
69 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
70 List-Post: <mailto:notmuch@notmuchmail.org>
\r
71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
72 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
73 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
74 X-List-Received-Date: Sun, 14 Feb 2016 18:40:26 -0000
\r
76 From: David Edmondson <dme@dme.org>
\r
78 No code uses the 'no-buttons argument to
\r
79 `notmuch-show-insert-bodypart', so remove it.
\r
81 emacs/notmuch-show.el | 12 +++---------
\r
82 1 file changed, 3 insertions(+), 9 deletions(-)
\r
84 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
85 index 37ed74d..f0bbff0 100644
\r
86 --- a/emacs/notmuch-show.el
\r
87 +++ b/emacs/notmuch-show.el
\r
88 @@ -955,9 +955,7 @@ will return nil if the CID is unknown or cannot be retrieved."
\r
90 HIDE determines whether to show or hide the part and the button
\r
91 as follows: If HIDE is nil, show the part and the button. If HIDE
\r
92 -is t, hide the part initially and show the button. If HIDE is
\r
93 -'no-buttons, show the part but do not add any buttons (this is
\r
94 -useful for quoting in replies)."
\r
95 +is t, hide the part initially and show the button."
\r
97 (let* ((content-type (downcase (plist-get part :content-type)))
\r
98 (mime-type (notmuch-show-mime-type part))
\r
99 @@ -966,14 +964,10 @@ useful for quoting in replies)."
\r
100 (> notmuch-show-max-text-part-size 0)
\r
101 (> (length (plist-get part :content)) notmuch-show-max-text-part-size)))
\r
103 - ;; We show the part button if notmuch-show-insert-header-p
\r
104 - ;; says to, unless HIDE is 'no-buttons.
\r
105 - (button (when (and (not (equal hide 'no-buttons))
\r
106 - (notmuch-show-insert-header-p part hide))
\r
107 + (button (when (notmuch-show-insert-header-p part hide)
\r
108 (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))
\r
109 ;; Hide the part initially if HIDE is t, or if it is too long
\r
110 - ;; and we have a button to allow toggling (thus reply which
\r
111 - ;; uses 'no-buttons automatically includes long parts)
\r
112 + ;; and we have a button to allow toggling.
\r
113 (show-part (not (or (equal hide t)
\r
114 (and long button))))
\r
115 (content-beg (point)))
\r