1 Return-Path: <dme@dme.org>
\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 257FD6DE02CE
\r
6 for <notmuch@notmuchmail.org>; Tue, 9 Feb 2016 04:24:00 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.045 tagged_above=-999 required=5 tests=[AWL=0.022,
\r
12 DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,
\r
13 RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652,
\r
14 UNPARSEABLE_RELAY=0.001] autolearn=disabled
\r
15 Received: from arlo.cworth.org ([127.0.0.1])
\r
16 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id TDLzUiLMy7oG for <notmuch@notmuchmail.org>;
\r
18 Tue, 9 Feb 2016 04:23:58 -0800 (PST)
\r
19 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com
\r
20 [74.125.82.68]) by arlo.cworth.org (Postfix) with ESMTPS id 7CCA66DE103A for
\r
21 <notmuch@notmuchmail.org>; Tue, 9 Feb 2016 04:23:57 -0800 (PST)
\r
22 Received: by mail-wm0-f68.google.com with SMTP id g62so3112152wme.2
\r
23 for <notmuch@notmuchmail.org>; Tue, 09 Feb 2016 04:23:57 -0800 (PST)
\r
24 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=dme-org.20150623.gappssmtp.com; s=20150623;
\r
26 h=from:to:subject:date:message-id:in-reply-to:references;
\r
27 bh=FpkU1cEESHbESLW0neDnT8mDZOooZG+SpHGxi4qXqWM=;
\r
28 b=uroYL4e4q+uQUKkgpnqRVbQR/j1y3CfzWGJSy5iJx3KvDo/SRkxL3Y+Z6a6JcXHzI/
\r
29 kcADodQ/kuIKevqCcuioC2p9i4Gnk1VIrXthEeknlTox3HvDXkG5Y5TywuRNqPykTVX5
\r
30 WCEqPxA6z8+Y3kFDgMoxskmKHArvGuOYnGMoNFVXrW9SFKRFW83D9+NMuNdYJmlIQUIt
\r
31 Ikms5+KZ6eskCk+upPcDL0+BTHBdexaYklcykKckph74nVqYOF9ZefRBT4znAh6G8dmc
\r
32 JHZb5AlT1847aZSIlZAyKXQgDfvIoSLoU5agl/pVtoMNuU68D0q9L2HQ88naI9FITwMt
\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:subject:date:message-id:in-reply-to
\r
38 bh=FpkU1cEESHbESLW0neDnT8mDZOooZG+SpHGxi4qXqWM=;
\r
39 b=ESwbWKmmL0eTEZUmE6UoDtzhdNN9H+MW8pNJkXqnza67hnsLHMxrfoSifREO0UuaTd
\r
40 HBzpF9TzG7E6VnX7hHw66FtmRkQYt3ElNvQgBZuZ0+JGI17Id6tKc1tZ3tWekm0Re4I0
\r
41 lMh1vZQdbxChnaOADkNpVO9/ELzMMHhZd4bO/Qs+amGpomqf6gcqRpJGC6eRdFmoCr9R
\r
42 4DkrP9o+ZcwLxuQijxtblJy/a+FRAdnrURsaP6vfgcjKoHMwKasVLaQfmh7EFOjER8eJ
\r
43 luYg+jainEHpHd9Xa3hu5oealAYsqEx87zx5ZKFi81EOH2q/I/2nsCbU9AIM8VlnbZVY
\r
46 AG10YORUTVgOWt3vOa5jud6k8CCqDGR6vPWQzU2EwfWR6sr6FUmlOfmpRvBJueGU8FqD1g==
\r
47 X-Received: by 10.28.175.193 with SMTP id y184mr4918689wme.62.1455020636174;
\r
48 Tue, 09 Feb 2016 04:23:56 -0800 (PST)
\r
49 Received: from disaster-area.hh.sledj.net
\r
50 ([2a01:348:1a2:1:ea39:35ff:fe2c:a227])
\r
51 by smtp.gmail.com with ESMTPSA id l7sm34513729wjx.14.2016.02.09.04.23.54
\r
52 for <notmuch@notmuchmail.org>
\r
53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
54 Tue, 09 Feb 2016 04:23:54 -0800 (PST)
\r
55 Received: from localhost (disaster-area.hh.sledj.net [local])
\r
56 by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id c510b3a9
\r
57 for <notmuch@notmuchmail.org>; Tue, 9 Feb 2016 12:23:51 +0000 (UTC)
\r
58 From: David Edmondson <dme@dme.org>
\r
59 To: notmuch@notmuchmail.org
\r
60 Subject: [PATCH v1 2/3] emacs: Always insert crypto buttons.
\r
61 Date: Tue, 9 Feb 2016 12:23:50 +0000
\r
62 Message-Id: <1455020631-15646-3-git-send-email-dme@dme.org>
\r
63 X-Mailer: git-send-email 2.1.4
\r
64 In-Reply-To: <1455020631-15646-1-git-send-email-dme@dme.org>
\r
65 References: <1455020631-15646-1-git-send-email-dme@dme.org>
\r
66 X-BeenThere: notmuch@notmuchmail.org
\r
67 X-Mailman-Version: 2.1.20
\r
69 List-Id: "Use and development of the notmuch mail system."
\r
70 <notmuch.notmuchmail.org>
\r
71 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
72 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
73 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
74 List-Post: <mailto:notmuch@notmuchmail.org>
\r
75 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
76 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
77 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
78 X-List-Received-Date: Tue, 09 Feb 2016 12:24:00 -0000
\r
80 When no decryption or signature examination is
\r
81 happening (i.e. `notmuch-crypto-process-mime' is `nil') insert buttons
\r
82 that indicate this, rather than remaining silent.
\r
84 emacs/notmuch-show.el | 29 +++++++++++------------------
\r
85 1 file changed, 11 insertions(+), 18 deletions(-)
\r
87 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
88 index 3345878..4bc5811 100644
\r
89 --- a/emacs/notmuch-show.el
\r
90 +++ b/emacs/notmuch-show.el
\r
91 @@ -646,13 +646,10 @@ will return nil if the CID is unknown or cannot be retrieved."
\r
93 (defun notmuch-show-insert-part-multipart/signed (msg part content-type nth depth button)
\r
94 (button-put button 'face 'notmuch-crypto-part-header)
\r
95 - ;; add signature status button if sigstatus provided
\r
96 - (if (plist-member part :sigstatus)
\r
97 - (let* ((from (notmuch-show-get-header :From msg))
\r
98 - (sigstatus (car (plist-get part :sigstatus))))
\r
99 - (notmuch-crypto-insert-sigstatus-button sigstatus from))
\r
100 - ;; if we're not adding sigstatus, tell the user how they can get it
\r
101 - (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts."))
\r
103 + ;; Insert a button detailing the signature status.
\r
104 + (notmuch-crypto-insert-sigstatus-button (car (plist-get part :sigstatus))
\r
105 + (notmuch-show-get-header :From msg))
\r
107 (let ((inner-parts (plist-get part :content))
\r
109 @@ -667,17 +664,13 @@ will return nil if the CID is unknown or cannot be retrieved."
\r
111 (defun notmuch-show-insert-part-multipart/encrypted (msg part content-type nth depth button)
\r
112 (button-put button 'face 'notmuch-crypto-part-header)
\r
113 - ;; add encryption status button if encstatus specified
\r
114 - (if (plist-member part :encstatus)
\r
115 - (let ((encstatus (car (plist-get part :encstatus))))
\r
116 - (notmuch-crypto-insert-encstatus-button encstatus)
\r
117 - ;; add signature status button if sigstatus specified
\r
118 - (if (plist-member part :sigstatus)
\r
119 - (let* ((from (notmuch-show-get-header :From msg))
\r
120 - (sigstatus (car (plist-get part :sigstatus))))
\r
121 - (notmuch-crypto-insert-sigstatus-button sigstatus from))))
\r
122 - ;; if we're not adding encstatus, tell the user how they can get it
\r
123 - (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts."))
\r
125 + ;; Insert a button detailing the encryption status.
\r
126 + (notmuch-crypto-insert-encstatus-button (car (plist-get part :encstatus)))
\r
128 + ;; Insert a button detailing the signature status.
\r
129 + (notmuch-crypto-insert-sigstatus-button (car (plist-get part :sigstatus))
\r
130 + (notmuch-show-get-header :From msg))
\r
132 (let ((inner-parts (plist-get part :content))
\r