X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-crypto.el;h=58947a2054bc3665583bc6936252052435ea86b2;hb=caaa10876046096320f4e69053542eabe17e7e55;hp=928de0bbd926b31f94604c9146a0eb3cdd9d2018;hpb=ea16b5ba850ae0cfad619ef2b0995a5b30ae3ebc;p=notmuch

diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 928de0bb..58947a20 100644
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -24,6 +24,8 @@
 (require 'epg)
 (require 'notmuch-lib)
 
+(declare-function notmuch-show-get-message-id "notmuch-show" (&optional bare))
+
 (defcustom notmuch-crypto-process-mime t
   "Should cryptographic MIME parts be processed?
 
@@ -121,17 +123,14 @@ by user FROM."
 		face 'notmuch-crypto-signature-good-key))
 	(setq button-action 'notmuch-crypto-sigstatus-good-callback
 	      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
 			     " from keyserver.")))
-
      ((string= status "bad")
       (setq label (concat "Bad signature (claimed key ID " keyid ")")
 	    face 'notmuch-crypto-signature-bad))
-
      (status
       (setq label (concat "Unknown signature status: " status)))
      (t
@@ -159,7 +158,8 @@ by user FROM."
 	(goto-char (point-max))
 	(insert (format "-- Key %s in message %s:\n"
 			fingerprint id))
-	(call-process notmuch-crypto-gpg-program nil t t "--batch" "--no-tty" "--list-keys" fingerprint))
+	(call-process notmuch-crypto-gpg-program nil t t
+		      "--batch" "--no-tty" "--list-keys" fingerprint))
       (recenter -1))))
 
 (declare-function notmuch-show-refresh-view "notmuch-show" (&optional reset-state))
@@ -218,17 +218,17 @@ corresponding key when the status button is pressed."
 	  (with-current-buffer buffer
 	    (goto-char (point-max))
 	    (insert (format "--- Retrieving key %s:\n" keyid)))
-	  (let ((p (make-process :name "notmuch GPG key retrieval"
-				 :connection-type 'pipe
-				 :buffer buffer
-				 :stderr buffer
-				 :command (list notmuch-crypto-gpg-program "--recv-keys" keyid)
-				 :sentinel #'notmuch-crypto--async-key-sentinel)))
+	  (let ((p (make-process
+		    :name "notmuch GPG key retrieval"
+		    :connection-type 'pipe
+		    :buffer buffer
+		    :stderr buffer
+		    :command (list notmuch-crypto-gpg-program "--recv-keys" keyid)
+		    :sentinel #'notmuch-crypto--async-key-sentinel)))
 	    (process-put p :gpg-key-id keyid)
 	    (process-put p :notmuch-show-buffer (current-buffer))
 	    (process-put p :notmuch-show-point (point))
 	    (message "Getting the GPG key %s asynchronously..." keyid)))
-
       (let ((window (display-buffer buffer)))
 	(with-selected-window window
 	  (with-current-buffer buffer