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 B59506DE01C2
\r
6 for <notmuch@notmuchmail.org>; Sun, 3 Apr 2016 08:38:39 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.272 tagged_above=-999 required=5 tests=[AWL=0.339,
\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 0Aj05nmpVgbw for <notmuch@notmuchmail.org>;
\r
18 Sun, 3 Apr 2016 08:38:31 -0700 (PDT)
\r
19 Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com
\r
21 by arlo.cworth.org (Postfix) with ESMTPS id C3ABA6DE02C9
\r
22 for <notmuch@notmuchmail.org>; Sun, 3 Apr 2016 08:38:30 -0700 (PDT)
\r
23 Received: by mail-lf0-f66.google.com with SMTP id f127so19003080lff.1
\r
24 for <notmuch@notmuchmail.org>; Sun, 03 Apr 2016 08:38:30 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=dme-org.20150623.gappssmtp.com; s=20150623;
\r
27 h=from:to:subject:date:message-id:in-reply-to:references;
\r
28 bh=mSW87U1TJsS4e2lRRVE0Yf9SOVaFuzhVTrDQnuNG5o4=;
\r
29 b=EL3Cr9WGwBVEdMrmiBmwhU1zO4ZwN7ulsr1Pg6WcbjCYYLYWDWWQnbADToMr6La/EJ
\r
30 a62J76wiZx55Sadhaw90YvV6tiMvOiK6oAWW7s9Ik/2AcZXzPME/sIi9B9jMqiaIvzK+
\r
31 qdXC3m5gKnPwudXB3t+9OWFZEvStRVir2kuRXoR0mqYBDmui3/PSKp7kmHB+2Pknqt8J
\r
32 zRdlwwHez4nPMHCQVpqoEBiU7yNGbvW0i0tlgDcCUXDhrV1/B+CuA68zkAPEo91OMme6
\r
33 MCvZiJYa/gmZ18z9Gy+rLr3/0mTepz9wlhHq3KatWVYHFnHGbq6kNoprrSd6vWSlr/hA
\r
35 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
36 d=1e100.net; s=20130820;
\r
37 h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
\r
39 bh=mSW87U1TJsS4e2lRRVE0Yf9SOVaFuzhVTrDQnuNG5o4=;
\r
40 b=fTNRi0a6lwKG+MC3mW1RQOTgBs+N7Ll5zmD25Rmj0vkpplx2LfEO16123rE86RPMnw
\r
41 sEcPZlIkYp4m0PpSdlawnvQiNJf18mWLhYEcnsdF9lmQPXi7Q12JH9z2wi9AE27/gzwK
\r
42 mOEl6n7y+BRhBtPkhpeSXdjvGOtKBj9Q0gjkzLSsZzQR7wWGpmUOftRu9w3+Y9zg6cxw
\r
43 MAKYrt71PsaLutjKZgkMRtEs5LtoF+h3WZHm3wsbM5MXi2En1yx1do17vA91/VBwtQal
\r
44 LmwdXHcIMRxM7sPy+3IRen7L98h8I7JcG7EsVxBcuGpwDA9VsBaLJYKWjD4AN8hghrbe
\r
47 AD7BkJKT0yJwdjhctcRDeuLqFPz8Lfe1cv0lZ9HU3DH660jKi+ffK3X8MZOsNabpbiPmmQ==
\r
48 X-Received: by 10.194.89.70 with SMTP id bm6mr1391419wjb.0.1459697907030;
\r
49 Sun, 03 Apr 2016 08:38:27 -0700 (PDT)
\r
50 Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net.
\r
52 by smtp.gmail.com with ESMTPSA id 192sm9261837wmw.0.2016.04.03.08.38.25
\r
53 for <notmuch@notmuchmail.org>
\r
54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
55 Sun, 03 Apr 2016 08:38:26 -0700 (PDT)
\r
56 Received: from localhost (disaster-area.hh.sledj.net [local])
\r
57 by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 1a35477d
\r
58 for <notmuch@notmuchmail.org>; Sun, 3 Apr 2016 15:38:23 +0000 (UTC)
\r
59 From: David Edmondson <dme@dme.org>
\r
60 To: notmuch@notmuchmail.org
\r
61 Subject: [PATCH v2 1/2] emacs: Always insert crypto buttons.
\r
62 Date: Sun, 3 Apr 2016 16:38:22 +0100
\r
63 Message-Id: <1459697903-32673-2-git-send-email-dme@dme.org>
\r
64 X-Mailer: git-send-email 2.1.4
\r
65 In-Reply-To: <1459697903-32673-1-git-send-email-dme@dme.org>
\r
66 References: <1459697903-32673-1-git-send-email-dme@dme.org>
\r
67 X-BeenThere: notmuch@notmuchmail.org
\r
68 X-Mailman-Version: 2.1.20
\r
70 List-Id: "Use and development of the notmuch mail system."
\r
71 <notmuch.notmuchmail.org>
\r
72 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
73 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
74 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
75 List-Post: <mailto:notmuch@notmuchmail.org>
\r
76 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
77 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
78 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
79 X-List-Received-Date: Sun, 03 Apr 2016 15:38:39 -0000
\r
81 When no decryption or signature examination is
\r
82 happening (i.e. `notmuch-crypto-process-mime' is `nil') insert buttons
\r
83 that indicate this, rather than remaining silent.
\r
85 emacs/notmuch-show.el | 34 +++++++++++-----------------------
\r
86 1 file changed, 11 insertions(+), 23 deletions(-)
\r
88 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
89 index 7c34449..fcb539a 100644
\r
90 --- a/emacs/notmuch-show.el
\r
91 +++ b/emacs/notmuch-show.el
\r
92 @@ -642,15 +642,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
95 (button-put button 'face 'notmuch-crypto-part-header))
\r
96 - ;; Add signature status button if sigstatus provided.
\r
97 - (if (plist-member part :sigstatus)
\r
98 - (let* ((from (notmuch-show-get-header :From msg))
\r
99 - (sigstatus (car (plist-get part :sigstatus))))
\r
100 - (notmuch-crypto-insert-sigstatus-button sigstatus from))
\r
101 - ;; If we're not adding the signature status, tell the user how
\r
102 - ;; they can get it.
\r
104 - (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts.")))
\r
106 + ;; Insert a button detailing the signature status.
\r
107 + (notmuch-crypto-insert-sigstatus-button (car (plist-get part :sigstatus))
\r
108 + (notmuch-show-get-header :From msg))
\r
110 (let ((inner-parts (plist-get part :content))
\r
112 @@ -666,20 +661,13 @@ will return nil if the CID is unknown or cannot be retrieved."
\r
113 (defun notmuch-show-insert-part-multipart/encrypted (msg part content-type nth depth button)
\r
115 (button-put button 'face 'notmuch-crypto-part-header))
\r
116 - ;; Add encryption status button if encryption status is specified.
\r
117 - (if (plist-member part :encstatus)
\r
118 - (let ((encstatus (car (plist-get part :encstatus))))
\r
119 - (notmuch-crypto-insert-encstatus-button encstatus)
\r
120 - ;; Add signature status button if signature status is
\r
122 - (if (plist-member part :sigstatus)
\r
123 - (let* ((from (notmuch-show-get-header :From msg))
\r
124 - (sigstatus (car (plist-get part :sigstatus))))
\r
125 - (notmuch-crypto-insert-sigstatus-button sigstatus from))))
\r
126 - ;; If we're not adding the encryption status, tell the user how
\r
127 - ;; they can get it.
\r
129 - (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic MIME parts.")))
\r
131 + ;; Insert a button detailing the encryption status.
\r
132 + (notmuch-crypto-insert-encstatus-button (car (plist-get part :encstatus)))
\r
134 + ;; Insert a button detailing the signature status.
\r
135 + (notmuch-crypto-insert-sigstatus-button (car (plist-get part :sigstatus))
\r
136 + (notmuch-show-get-header :From msg))
\r
138 (let ((inner-parts (plist-get part :content))
\r