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