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 5EC126DE1271
\r
6 for <notmuch@notmuchmail.org>; Tue, 9 Feb 2016 04:23:58 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.556 tagged_above=-999 required=5 tests=[AWL=0.623,
\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 SxI2paR37KtU for <notmuch@notmuchmail.org>;
\r
18 Tue, 9 Feb 2016 04:23:56 -0800 (PST)
\r
19 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com
\r
20 [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id 39AA66DE0AC2 for
\r
21 <notmuch@notmuchmail.org>; Tue, 9 Feb 2016 04:23:56 -0800 (PST)
\r
22 Received: by mail-wm0-f66.google.com with SMTP id g62so3112079wme.2
\r
23 for <notmuch@notmuchmail.org>; Tue, 09 Feb 2016 04:23:56 -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=Pd2fWsl86o8Og//AoAEW/KXyXcjnOb/S7tUEWGuX164=;
\r
28 b=EiViW6rsVEUqOmvL13b+3Ll8Tl388v2CxxYJIZcJlkGpzqAkWr1YYorQAs/f7Cv5k6
\r
29 tz5Sx2T1OlJibcstljoNgtLF+f2rP9TTf6MCA/4AxhximMU5G73UmkgWBO7N7uyvs/uk
\r
30 tX4tWgfN0asEk3bE2EFOgyhEGa7yZKSsEfDPcehU+kHFtqYSHpBA1CA4Bs3bCUPhV1UT
\r
31 zISNuYmmolJcXJf0BrhKZEudAa7nQkN7fqNz5razgqt4+DwTmo6BxuhssRD7UQFWxJjG
\r
32 30t+0VcSFCwUbRQ2MycwdsJlXFS7AWk36ohh6I2d4UW/zJHoJWAU07Kx0xRZARkv9xmR
\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=Pd2fWsl86o8Og//AoAEW/KXyXcjnOb/S7tUEWGuX164=;
\r
39 b=BLApwfHeoiXNT8nmFiJ9l8+zGTeAnOgwTVNgrT9f+kvSHDJV4TIGMTdO/dZsjkYnd0
\r
40 bI8Vunr0nbqSECAsAWJMuiUue86Uw5XDfT1Ak5mB70VKI9bbbx4ZzmBBqfXRMYX4YkP0
\r
41 HYYjaH0fjcF3eE7gcNO0bEdrwGTMc7o+4ukI8AWDjNg1q/xsHCDycdvKbqMfp7e96aSn
\r
42 4YK43C8sl2nSi5yVKDzJGDyWyUNbVlt45vOxdhG2TajRqdVHf7LGaek7TfPRKkpdnsXF
\r
43 9LZYjtM8yUapjs3o6pgBxSLhwyKSNv3jnJ3dtglvS5+zCj0lNOIhbGDsuhyabaAr0psZ
\r
46 AG10YOQBvXVD97M7gSmsQwYdvh9k7wNfAIiiGZlMg+iMvGP3QrMldSJOueW/H7mI1BmG1w==
\r
47 X-Received: by 10.28.4.216 with SMTP id 207mr4423853wme.20.1455020634899;
\r
48 Tue, 09 Feb 2016 04:23:54 -0800 (PST)
\r
49 Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net.
\r
51 by smtp.gmail.com with ESMTPSA id y188sm17283989wmy.11.2016.02.09.04.23.53
\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 040a985e
\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 1/3] emacs: Improve crypto button labels.
\r
61 Date: Tue, 9 Feb 2016 12:23:49 +0000
\r
62 Message-Id: <1455020631-15646-2-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:23:58 -0000
\r
80 Make the labels for both encryption and signature buttons share a common
\r
81 format, in which both report the status if it is not one of those known.
\r
83 emacs/notmuch-crypto.el | 7 ++++---
\r
84 1 file changed, 4 insertions(+), 3 deletions(-)
\r
86 diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
\r
87 index 5233824..73ebf51 100644
\r
88 --- a/emacs/notmuch-crypto.el
\r
89 +++ b/emacs/notmuch-crypto.el
\r
90 @@ -110,8 +110,8 @@ mode."
\r
91 (setq label (concat "Bad signature (claimed key ID " keyid ")"))
\r
92 (setq face 'notmuch-crypto-signature-bad)))
\r
94 - (setq label "Unknown signature status")
\r
95 - (if status (setq label (concat label " \"" status "\"")))))
\r
96 + (setq label (concat "Unknown signature status"
\r
97 + (if status (concat ": " status))))))
\r
99 (concat "[ " label " ]")
\r
100 :type 'notmuch-crypto-status-button-type
\r
101 @@ -161,7 +161,8 @@ mode."
\r
102 ((string= status "bad")
\r
103 (setq label "Decryption error"))
\r
105 - (setq label (concat "Unknown encstatus \"" status "\""))))
\r
106 + (setq label (concat "Unknown encryption status"
\r
107 + (if status (concat ": " status))))))
\r
109 (concat "[ " label " ]")
\r
110 :type 'notmuch-crypto-status-button-type
\r