X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-crypto.el;h=e376aa8022d237caee6781eb29eb28e4475dd2bd;hb=18e720314fce5836f89b72c469e7a3d596f9ae7e;hp=80ac350e6c19f4e871f063280d1c742e02bc0be2;hpb=643ce61c1babf6e73ca7e03fb907282e7ee3b176;p=notmuch
diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 80ac350e..e376aa80 100644
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -1,4 +1,4 @@
-;; notmuch-crypto.el --- functions for handling display of cryptographic metadata.
+;;; notmuch-crypto.el --- functions for handling display of cryptographic metadata.
;;
;; Copyright © Jameson Rollins
;;
@@ -15,10 +15,14 @@
;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
-;; along with Notmuch. If not, see .
+;; along with Notmuch. If not, see .
;;
;; Authors: Jameson Rollins
+;;; Code:
+
+(require 'notmuch-lib)
+
(defcustom notmuch-crypto-process-mime nil
"Should cryptographic MIME parts be processed?
@@ -76,7 +80,8 @@ mode."
(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.")
+ 'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts."
+ :supertype 'notmuch-button-type)
(defun notmuch-crypto-insert-sigstatus-button (sigstatus from)
(let* ((status (plist-get sigstatus :status))
@@ -101,14 +106,14 @@ mode."
(let ((keyid (concat "0x" (plist-get sigstatus :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 retreive key ID " keyid " from keyserver and redisplay."))))
+ (setq help-msg (concat "Click to retrieve key ID " keyid " from keyserver and redisplay."))))
((string= status "bad")
(let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
(setq label (concat "Bad signature (claimed key ID " keyid ")"))
(setq face 'notmuch-crypto-signature-bad)))
(t
- (setq label "Unknown signature status")
- (if status (setq label (concat label " \"" status "\"")))))
+ (setq label (concat "Unknown signature status"
+ (if status (concat ": " status))))))
(insert-button
(concat "[ " label " ]")
:type 'notmuch-crypto-status-button-type
@@ -120,7 +125,7 @@ mode."
:notmuch-from from)
(insert "\n")))
-(declare-function notmuch-show-refresh-view "notmuch-show" (&optional crypto-switch))
+(declare-function notmuch-show-refresh-view "notmuch-show" (&optional reset-state))
(defun notmuch-crypto-sigstatus-good-callback (button)
(let* ((sigstatus (button-get button :notmuch-sigstatus))
@@ -129,6 +134,7 @@ mode."
(window (display-buffer buffer t nil)))
(with-selected-window window
(with-current-buffer buffer
+ (goto-char (point-max))
(call-process "gpg" nil t t "--list-keys" fingerprint))
(recenter -1))))
@@ -139,6 +145,7 @@ mode."
(window (display-buffer buffer t nil)))
(with-selected-window window
(with-current-buffer buffer
+ (goto-char (point-max))
(call-process "gpg" nil t t "--recv-keys" keyid)
(insert "\n")
(call-process "gpg" nil t t "--list-keys" keyid))
@@ -156,7 +163,8 @@ mode."
((string= status "bad")
(setq label "Decryption error"))
(t
- (setq label (concat "Unknown encstatus \"" status "\""))))
+ (setq label (concat "Unknown encryption status"
+ (if status (concat ": " status))))))
(insert-button
(concat "[ " label " ]")
:type 'notmuch-crypto-status-button-type
@@ -168,3 +176,5 @@ mode."
;;
(provide 'notmuch-crypto)
+
+;;; notmuch-crypto.el ends here