[PATCH 09/25] emacs: Define several faces for the crypto-status button

diff --git a/7f/4e74db0986be0eb19eeaba0457062a9c14614a b/7f/4e74db0986be0eb19eeaba0457062a9c14614a
new file mode 100644 (file)
index 0000000..66fc3b3
--- /dev/null
+++ b/7f/4e74db0986be0eb19eeaba0457062a9c14614a
@@ -0,0 +1,156 @@
+Return-Path: <jrollins@servo.finestructure.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7DBCF429E2F\r
+       for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:21 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.921\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5\r
+       tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 18QhP2TASbD3 for <notmuch@notmuchmail.org>;\r
+       Sat, 28 May 2011 14:52:19 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id B21AE429E30\r
+       for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:14 -0700 (PDT)\r
+Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by earth-doxen-postvirus (Postfix) with ESMTP id 3B4A766E00B9;\r
+       Sat, 28 May 2011 14:52:13 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
+Received: from servo.finestructure.net (cpe-98-149-172-122.socal.res.rr.com\r
+       [98.149.172.122]) (Authenticated sender: jrollins)\r
+       by earth-doxen-submit (Postfix) with ESMTP id 41C0166E034C;\r
+       Sat, 28 May 2011 14:52:09 -0700 (PDT)\r
+Received: by servo.finestructure.net (Postfix, from userid 1000)\r
+       id 2E9C07A3; Sat, 28 May 2011 14:52:05 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH 09/25] emacs: Define several faces for the crypto-status\r
+ button\r
+Date: Sat, 28 May 2011 14:51:44 -0700\r
+Message-Id: <1306619520-25730-10-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1306619520-25730-9-git-send-email-jrollins@finestructure.net>\r
+References: <1306619520-25730-1-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-2-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-3-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-4-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-5-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-6-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-7-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-8-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-9-git-send-email-jrollins@finestructure.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 28 May 2011 21:52:22 -0000\r
+\r
+From: Thomas Jost <schnouki@schnouki.net>\r
+\r
+Signed-off-by: Jameson Graef Rollins <jrollins@finestructure.net>\r
+\r
+jrollins modified this patch to conform to recent changes in the\r
+crypto processing since this patch was originally sent in.\r
+---\r
+ emacs/notmuch-crypto.el |   42 ++++++++++++++++++++++++++++++++----------\r
+ 1 files changed, 32 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el\r
+index cb02840..f03266f 100644\r
+--- a/emacs/notmuch-crypto.el\r
++++ b/emacs/notmuch-crypto.el\r
+@@ -36,36 +36,58 @@ search."\r
+   :group 'notmuch\r
+   :type 'boolean)\r
+ \r
++(defface notmuch-crypto-signature-good\r
++  '((t (:background "green" :foreground "black")))\r
++  "Face used for good signatures."\r
++  :group 'notmuch)\r
++\r
++(defface notmuch-crypto-signature-good-key\r
++  '((t (:background "orange" :foreground "black")))\r
++  "Face used for good signatures."\r
++  :group 'notmuch)\r
++\r
++(defface notmuch-crypto-signature-bad\r
++  '((t (:background "red" :foreground "black")))\r
++  "Face used for bad signatures."\r
++  :group 'notmuch)\r
++\r
++(defface notmuch-crypto-signature-unknown\r
++  '((t (:background "red" :foreground "black")))\r
++  "Face used for signatures of unknown status."\r
++  :group 'notmuch)\r
++\r
++(defface notmuch-crypto-decryption\r
++  '((t (:background "purple" :foreground "black")))\r
++  "Face used for encryption/decryption status messages."\r
++  :group 'notmuch)\r
++\r
+ (define-button-type 'notmuch-crypto-status-button-type\r
+   'action '(lambda (button) (message (button-get button 'help-echo)))\r
+   'follow-link t\r
+-  'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts."\r
+-  'face '(:foreground "blue")\r
+-  'mouse-face '(:foreground "blue"))\r
++  'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts.")\r
+ \r
+ (defun notmuch-crypto-insert-sigstatus-button (sigstatus from)\r
+   (let* ((status (plist-get sigstatus :status))\r
+        (help-msg nil)\r
+        (label "Signature not processed")\r
+-       (face '(:background "red" :foreground "black")))\r
++       (face 'notmuch-crypto-signature-unknown))\r
+     (cond\r
+      ((string= status "good")\r
+       ; if userid present, userid has full or greater validity\r
+       (if (plist-member sigstatus :userid)\r
+         (let ((userid (plist-get sigstatus :userid)))\r
+           (setq label (concat "Good signature by: " userid))\r
+-          (setq face '(:background "green" :foreground "black")))\r
++          (setq face 'notmuch-crypto-signature-good))\r
+       (let ((fingerprint (concat "0x" (plist-get sigstatus :fingerprint))))\r
+         (setq label (concat "Good signature by key: " fingerprint))\r
+-        (setq face '(:background "orange" :foreground "black")))))\r
++        (setq face 'notmuch-crypto-signature-good-key))))\r
+      ((string= status "error")\r
+       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))\r
+-      (setq label (concat "Unknown key ID " keyid " or unsupported algorithm"))\r
+-      (setq face '(:background "red" :foreground "black"))))\r
++      (setq label (concat "Unknown key ID " keyid " or unsupported algorithm"))))\r
+      ((string= status "bad")\r
+       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))\r
+       (setq label (concat "Bad signature (claimed key ID " keyid ")"))\r
+-      (setq face '(:background "red" :foreground "black"))))\r
++      (setq face 'notmuch-crypto-signature-bad)))\r
+      (t\r
+       (setq label "Unknown signature status")\r
+       (if status (setq label (concat label " \"" status "\"")))))\r
+@@ -83,7 +105,7 @@ search."\r
+   (let* ((status (plist-get encstatus :status))\r
+        (help-msg nil)\r
+        (label "Decryption not attempted")\r
+-       (face '(:background "purple" :foreground "black")))\r
++       (face 'notmuch-crypto-decryption))\r
+     (cond\r
+      ((string= status "good")\r
+       (setq label "Decryption successful"))\r
+-- \r
+1.7.4.4\r
+\r