X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-crypto.el;h=420b008f8f6e376ba6fa39904c573c2ca32a96a7;hp=58947a2054bc3665583bc6936252052435ea86b2;hb=18d289c86309ae796e6f027c289b17ccdd38f220;hpb=2ee8e971c546f0ffed726099b844cbd5f05de029

diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 58947a20..420b008f 100644
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -117,20 +117,21 @@ by user FROM."
 	    (userid (plist-get sigstatus :userid)))
 	;; If userid is present it has full or greater validity.
 	(if userid
-	    (setq label (concat "Good signature by: " userid)
-		  face 'notmuch-crypto-signature-good)
-	  (setq label (concat "Good signature by key: " fingerprint)
-		face 'notmuch-crypto-signature-good-key))
-	(setq button-action 'notmuch-crypto-sigstatus-good-callback
-	      help-msg (concat "Click to list key ID 0x" fingerprint "."))))
+	    (progn
+	      (setq label (concat "Good signature by: " userid))
+	      (setq face 'notmuch-crypto-signature-good))
+	  (setq label (concat "Good signature by key: " fingerprint))
+	  (setq face 'notmuch-crypto-signature-good-key))
+	(setq button-action 'notmuch-crypto-sigstatus-good-callback)
+	(setq help-msg (concat "Click to list key ID 0x" fingerprint "."))))
      ((string= status "error")
-      (setq label (concat "Unknown key ID " keyid " or unsupported algorithm")
-	    button-action 'notmuch-crypto-sigstatus-error-callback
-	    help-msg (concat "Click to retrieve key ID " keyid
+      (setq label (concat "Unknown key ID " keyid " or unsupported algorithm"))
+      (setq button-action 'notmuch-crypto-sigstatus-error-callback)
+      (setq help-msg (concat "Click to retrieve key ID " keyid
 			     " from keyserver.")))
      ((string= status "bad")
-      (setq label (concat "Bad signature (claimed key ID " keyid ")")
-	    face 'notmuch-crypto-signature-bad))
+      (setq label (concat "Bad signature (claimed key ID " keyid ")"))
+      (setq face 'notmuch-crypto-signature-bad))
      (status
       (setq label (concat "Unknown signature status: " status)))
      (t