[PATCH v1 1/3] emacs: Improve crypto button labels.

diff --git a/83/fe43ac509e4d59c20514440881b42ca486955a b/83/fe43ac509e4d59c20514440881b42ca486955a
new file mode 100644 (file)
index 0000000..5b67798
--- /dev/null
+++ b/83/fe43ac509e4d59c20514440881b42ca486955a
@@ -0,0 +1,113 @@
+Return-Path: <dme@dme.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 5EC126DE1271\r
+ for <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 04:23:58 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.556\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.556 tagged_above=-999 required=5 tests=[AWL=0.623, \r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652,\r
+ UNPARSEABLE_RELAY=0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id SxI2paR37KtU for <notmuch@notmuchmail.org>;\r
+ Tue,  9 Feb 2016 04:23:56 -0800 (PST)\r
+Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com\r
+ [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id 39AA66DE0AC2 for\r
+ <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 04:23:56 -0800 (PST)\r
+Received: by mail-wm0-f66.google.com with SMTP id g62so3112079wme.2\r
+ for <notmuch@notmuchmail.org>; Tue, 09 Feb 2016 04:23:56 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=dme-org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:subject:date:message-id:in-reply-to:references;\r
+ bh=Pd2fWsl86o8Og//AoAEW/KXyXcjnOb/S7tUEWGuX164=;\r
+ b=EiViW6rsVEUqOmvL13b+3Ll8Tl388v2CxxYJIZcJlkGpzqAkWr1YYorQAs/f7Cv5k6\r
+ tz5Sx2T1OlJibcstljoNgtLF+f2rP9TTf6MCA/4AxhximMU5G73UmkgWBO7N7uyvs/uk\r
+ tX4tWgfN0asEk3bE2EFOgyhEGa7yZKSsEfDPcehU+kHFtqYSHpBA1CA4Bs3bCUPhV1UT\r
+ zISNuYmmolJcXJf0BrhKZEudAa7nQkN7fqNz5razgqt4+DwTmo6BxuhssRD7UQFWxJjG\r
+ 30t+0VcSFCwUbRQ2MycwdsJlXFS7AWk36ohh6I2d4UW/zJHoJWAU07Kx0xRZARkv9xmR\r
+ 1Hzw==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=Pd2fWsl86o8Og//AoAEW/KXyXcjnOb/S7tUEWGuX164=;\r
+ b=BLApwfHeoiXNT8nmFiJ9l8+zGTeAnOgwTVNgrT9f+kvSHDJV4TIGMTdO/dZsjkYnd0\r
+ bI8Vunr0nbqSECAsAWJMuiUue86Uw5XDfT1Ak5mB70VKI9bbbx4ZzmBBqfXRMYX4YkP0\r
+ HYYjaH0fjcF3eE7gcNO0bEdrwGTMc7o+4ukI8AWDjNg1q/xsHCDycdvKbqMfp7e96aSn\r
+ 4YK43C8sl2nSi5yVKDzJGDyWyUNbVlt45vOxdhG2TajRqdVHf7LGaek7TfPRKkpdnsXF\r
+ 9LZYjtM8yUapjs3o6pgBxSLhwyKSNv3jnJ3dtglvS5+zCj0lNOIhbGDsuhyabaAr0psZ\r
+ jzSA==\r
+X-Gm-Message-State:\r
+ AG10YOQBvXVD97M7gSmsQwYdvh9k7wNfAIiiGZlMg+iMvGP3QrMldSJOueW/H7mI1BmG1w==\r
+X-Received: by 10.28.4.216 with SMTP id 207mr4423853wme.20.1455020634899;\r
+ Tue, 09 Feb 2016 04:23:54 -0800 (PST)\r
+Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net.\r
+ [81.149.164.25])\r
+ by smtp.gmail.com with ESMTPSA id y188sm17283989wmy.11.2016.02.09.04.23.53\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Tue, 09 Feb 2016 04:23:54 -0800 (PST)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 040a985e\r
+ for <notmuch@notmuchmail.org>; Tue, 9 Feb 2016 12:23:51 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v1 1/3] emacs: Improve crypto button labels.\r
+Date: Tue,  9 Feb 2016 12:23:49 +0000\r
+Message-Id: <1455020631-15646-2-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1455020631-15646-1-git-send-email-dme@dme.org>\r
+References: <1455020631-15646-1-git-send-email-dme@dme.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 09 Feb 2016 12:23:58 -0000\r
+\r
+Make the labels for both encryption and signature buttons share a common\r
+format, in which both report the status if it is not one of those known.\r
+---\r
+ emacs/notmuch-crypto.el | 7 ++++---\r
+ 1 file changed, 4 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el\r
+index 5233824..73ebf51 100644\r
+--- a/emacs/notmuch-crypto.el\r
++++ b/emacs/notmuch-crypto.el\r
+@@ -110,8 +110,8 @@ mode."\r
+       (setq label (concat "Bad signature (claimed key ID " keyid ")"))\r
+       (setq face 'notmuch-crypto-signature-bad)))\r
+      (t\r
+-      (setq label "Unknown signature status")\r
+-      (if status (setq label (concat label " \"" status "\"")))))\r
++      (setq label (concat "Unknown signature status"\r
++                        (if status (concat ": " status))))))\r
+     (insert-button\r
+      (concat "[ " label " ]")\r
+      :type 'notmuch-crypto-status-button-type\r
+@@ -161,7 +161,8 @@ mode."\r
+      ((string= status "bad")\r
+       (setq label "Decryption error"))\r
+      (t\r
+-      (setq label (concat "Unknown encstatus \"" status "\""))))\r
++      (setq label (concat "Unknown encryption status"\r
++                        (if status (concat ": " status))))))\r
+     (insert-button\r
+      (concat "[ " label " ]")\r
+      :type 'notmuch-crypto-status-button-type\r
+-- \r
+2.1.4\r
+\r