Merge tag '0.32.2'

[notmuch] / emacs / notmuch-crypto.el

diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index ee5231e59ea957d8cfa5e7b7c4b92b9d109810b5..5edfe94cf0cac989a40a97d3b3760dde5d03f78a 100644 (file)
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -103,7 +103,7 @@ mode."
 ;;; Functions
 
 (define-button-type 'notmuch-crypto-status-button-type
-  'action (lambda (button) (message (button-get button 'help-echo)))
+  'action (lambda (button) (message "%s" (button-get button 'help-echo)))
   'follow-link t
   'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts."
   :supertype 'notmuch-button-type)
@@ -119,14 +119,14 @@ mode."
     (cond
      ((string= status "good")
       (let ((fingerprint (concat "0x" (plist-get sigstatus :fingerprint)))
-           (userid (plist-get sigstatus :userid)))
-       ;; If userid is present it has full or greater validity.
-       (if userid
-           (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))
+           (email-or-userid (or (plist-get sigstatus :email)
+                                 (plist-get sigstatus :userid))))
+       ;; If email or userid are present, they have full or greater validity.
+       (setq label (concat "Good signature by key: " fingerprint))
+       (setq face 'notmuch-crypto-signature-good-key)
+       (when email-or-userid
+         (setq label (concat "Good signature by: " email-or-user-id))
+         (setq face 'notmuch-crypto-signature-good))
        (setq button-action 'notmuch-crypto-sigstatus-good-callback)
        (setq help-msg (concat "Click to list key ID 0x" fingerprint "."))))
      ((string= status "error")
@@ -171,7 +171,7 @@ mode."
 (declare-function notmuch-show-refresh-view "notmuch-show" (&optional reset-state))
 (declare-function notmuch-show-get-message-id "notmuch-show" (&optional bare))
 
-(defun notmuch-crypto--async-key-sentinel (process event)
+(defun notmuch-crypto--async-key-sentinel (process _event)
   "When the user asks for a GPG key to be retrieved
 asynchronously, handle completion of that task.