test: update emacs test to use test_expect_equal_file

[notmuch] / emacs / notmuch-crypto.el

diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 944452b980706a9358492090480a3e60309236ae..f03266ffc4e54932a82ad16963e4ca65d86e28cc 100644 (file)
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -36,36 +36,58 @@ search."
   :group 'notmuch
   :type 'boolean)
 
+(defface notmuch-crypto-signature-good
+  '((t (:background "green" :foreground "black")))
+  "Face used for good signatures."
+  :group 'notmuch)
+
+(defface notmuch-crypto-signature-good-key
+  '((t (:background "orange" :foreground "black")))
+  "Face used for good signatures."
+  :group 'notmuch)
+
+(defface notmuch-crypto-signature-bad
+  '((t (:background "red" :foreground "black")))
+  "Face used for bad signatures."
+  :group 'notmuch)
+
+(defface notmuch-crypto-signature-unknown
+  '((t (:background "red" :foreground "black")))
+  "Face used for signatures of unknown status."
+  :group 'notmuch)
+
+(defface notmuch-crypto-decryption
+  '((t (:background "purple" :foreground "black")))
+  "Face used for encryption/decryption status messages."
+  :group 'notmuch)
+
 (define-button-type 'notmuch-crypto-status-button-type
   'action '(lambda (button) (message (button-get button 'help-echo)))
   'follow-link t
-  'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts."
-  'face '(:foreground "blue")
-  'mouse-face '(:foreground "blue"))
+  'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts.")
 
 (defun notmuch-crypto-insert-sigstatus-button (sigstatus from)
   (let* ((status (plist-get sigstatus :status))
         (help-msg nil)
-        (label "multipart/signed: signature not processed")
-        (face '(:background "red" :foreground "black")))
+        (label "Signature not processed")
+        (face 'notmuch-crypto-signature-unknown))
     (cond
      ((string= status "good")
       ; if userid present, userid has full or greater validity
       (if (plist-member sigstatus :userid)
          (let ((userid (plist-get sigstatus :userid)))
            (setq label (concat "Good signature by: " userid))
-           (setq face '(:background "green" :foreground "black")))
+           (setq face 'notmuch-crypto-signature-good))
        (let ((fingerprint (concat "0x" (plist-get sigstatus :fingerprint))))
          (setq label (concat "Good signature by key: " fingerprint))
-         (setq face '(:background "orange" :foreground "black")))))
+         (setq face 'notmuch-crypto-signature-good-key))))
      ((string= status "error")
       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
-       (setq label (concat "Unknown key ID " keyid " or unsupported algorithm"))
-       (setq face '(:background "red" :foreground "black"))))
+       (setq label (concat "Unknown key ID " keyid " or unsupported algorithm"))))
      ((string= status "bad")
       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
        (setq label (concat "Bad signature (claimed key ID " keyid ")"))
-       (setq face '(:background "red" :foreground "black"))))
+       (setq face 'notmuch-crypto-signature-bad)))
      (t
       (setq label "Unknown signature status")
       (if status (setq label (concat label " \"" status "\"")))))
@@ -82,17 +104,17 @@ search."
 (defun notmuch-crypto-insert-encstatus-button (encstatus)
   (let* ((status (plist-get encstatus :status))
         (help-msg nil)
-        (label "multipart/encrypted: decryption not attempted")
-        (face '(:background "purple" :foreground "black")))
+        (label "Decryption not attempted")
+        (face 'notmuch-crypto-decryption))
     (cond
      ((string= status "good")
-      (setq label "decryption successful"))
+      (setq label "Decryption successful"))
      ((string= status "bad")
-      (setq label "decryption error"))
+      (setq label "Decryption error"))
      (t
-      (setq label (concat "unknown encstatus \"" status "\""))))
+      (setq label (concat "Unknown encstatus \"" status "\""))))
     (insert-button
-     (concat "[ multipart/encrypted: " label " ]")
+     (concat "[ " label " ]")
      :type 'notmuch-crypto-status-button-type
      'help-echo help-msg
      'face face