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 8973D6DE187B
\r
6 for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:25:10 -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 f3CkXgS71J1j for <notmuch@notmuchmail.org>;
\r
19 Sat, 20 Feb 2016 10:25:08 -0800 (PST)
\r
20 Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com
\r
21 [74.125.82.45]) by arlo.cworth.org (Postfix) with ESMTPS id 693886DE186E for
\r
22 <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:56 -0800 (PST)
\r
23 Received: by mail-wm0-f45.google.com with SMTP id g62so107921917wme.0
\r
24 for <notmuch@notmuchmail.org>; Sat, 20 Feb 2016 10:24:56 -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=EAXBYUl71fhbS6OiyyBabpTmArfujc13gDf7pA1YNPU=;
\r
28 b=Gs6EPepGa1jE8AatOwaGya3NZ7ENFHy6f8c+wQTr6qXbNeHeV9u45aijUbI5dae4f5
\r
29 0UkkHkIQHmgswOxUXoCxqLOPKMiVdnHijmvalcSPGjTClNYPUorBbFHRujWgzaZlReI9
\r
30 p6EneFqgQMttl7Eh9rEoIjkX93+S53jj8TihF5fYnucTgUFnAP+FMPgSWhc3TEehcZrK
\r
31 zBkFg4xj0vhGnn2LljmdNaEM+jMmK7kKxrUlU+iNaHZHZAggZ4uMXl4a+OxgALyaG5QI
\r
32 pV2RAfeH+346jGJ/Zd5DQaPkXgmxh5/5iNurWO5hPSWWkIzyuYU0GlRCGUb6eYcOwSK6
\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=EAXBYUl71fhbS6OiyyBabpTmArfujc13gDf7pA1YNPU=;
\r
39 b=QTvDBk+R/fHBmeeAHLGKnEA+X4tCLp3fQyCuHkoCEteWoKYhjUgmddFGmZ4JhN2Kno
\r
40 CuxRRDpF/RagEGRT8x9k1fVnR9NZnM2WLw7Y8kmUHZ6RYKErxRoRcz9/a72pvDWAU5hv
\r
41 jbePlFIYa5AiA/e539+tByWmwP9XX6m5L/VgZyvXO3ZkwIuj1FLq52EQwe3MArTU31pc
\r
42 hP93hGa+libeVvRFF1P5ajr6nJVAf7z6YBWnEV/vlG+rNqzwrhxvndc6albZX2QOoLKF
\r
43 zRVgwKgUZCUu67YUwbQIJh91k717Apg2AnQhXSIA42Qpr3OQADZPm9EPU6qbREKH8YBg
\r
46 AG10YORKp7jNlhA2PtRfLfADRxZfzV+Gi4HC/cxx9Oq8iwR7Lcl1wqMrgZxk5GNQu+PzcA==
\r
47 X-Received: by 10.28.146.145 with SMTP id u139mr3709360wmd.76.1455992695212;
\r
48 Sat, 20 Feb 2016 10:24:55 -0800 (PST)
\r
49 Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])
\r
50 by smtp.gmail.com with ESMTPSA id t12sm13044826wmt.20.2016.02.20.10.24.54
\r
51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
52 Sat, 20 Feb 2016 10:24:54 -0800 (PST)
\r
53 From: Mark Walters <markwalters1009@gmail.com>
\r
54 To: notmuch@notmuchmail.org
\r
55 Subject: [PATCH v6 5/6] emacs/show: Remove the 'no-buttons option of
\r
56 `notmuch-show-insert-bodypart'
\r
57 Date: Sat, 20 Feb 2016 18:24:39 +0000
\r
58 Message-Id: <1455992680-24978-6-git-send-email-markwalters1009@gmail.com>
\r
59 X-Mailer: git-send-email 2.1.4
\r
60 In-Reply-To: <1455992680-24978-1-git-send-email-markwalters1009@gmail.com>
\r
61 References: <1455992680-24978-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: Sat, 20 Feb 2016 18:25:10 -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 | 10 +++-------
\r
82 1 file changed, 3 insertions(+), 7 deletions(-)
\r
84 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
85 index 8222f0d..2a81ec1 100644
\r
86 --- a/emacs/notmuch-show.el
\r
87 +++ b/emacs/notmuch-show.el
\r
88 @@ -959,9 +959,7 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)
\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 @@ -972,12 +970,10 @@ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)
\r
101 ;; This default header-p function omits the part button for
\r
102 ;; the first (or only) part if this is text/plain.
\r
103 - (button (when (and (not (equal hide 'no-buttons))
\r
104 - (funcall notmuch-show-insert-header-p-function part hide))
\r
105 + (button (when (funcall notmuch-show-insert-header-p-function part hide)
\r
106 (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))
\r
107 ;; Hide the part initially if HIDE is t, or if it is too long
\r
108 - ;; and we have a button to allow toggling (thus reply which
\r
109 - ;; uses 'no-buttons automatically includes long parts)
\r
110 + ;; and we have a button to allow toggling.
\r
111 (show-part (not (or (equal hide t)
\r
112 (and long button))))
\r
113 (content-beg (point)))
\r