X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-crypto.el;h=0af727ef4dc68258b039691e0e85d58e95f48a72;hb=37d1fa5672133a4deb0efa631a21eeeb50a7c1a1;hp=52338249a82867a4e0fea4fb7788264fc9b15bd4;hpb=f0dfda5c7797f9db81ce35d270fe0ac406c7fca1;p=notmuch
diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 52338249..0af727ef 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,13 @@
;; 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 'epg)
(require 'notmuch-lib)
(defcustom notmuch-crypto-process-mime nil
@@ -40,7 +43,12 @@ mode."
:group 'notmuch-crypto)
(defface notmuch-crypto-part-header
- '((t (:foreground "blue")))
+ '((((class color)
+ (background dark))
+ (:foreground "LightBlue1"))
+ (((class color)
+ (background light))
+ (:foreground "blue")))
"Face used for crypto parts headers."
:group 'notmuch-crypto
:group 'notmuch-faces)
@@ -110,8 +118,8 @@ mode."
(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
@@ -133,7 +141,7 @@ mode."
(with-selected-window window
(with-current-buffer buffer
(goto-char (point-max))
- (call-process "gpg" nil t t "--list-keys" fingerprint))
+ (call-process epg-gpg-program nil t t "--list-keys" fingerprint))
(recenter -1))))
(defun notmuch-crypto-sigstatus-error-callback (button)
@@ -144,9 +152,9 @@ mode."
(with-selected-window window
(with-current-buffer buffer
(goto-char (point-max))
- (call-process "gpg" nil t t "--recv-keys" keyid)
+ (call-process epg-gpg-program nil t t "--recv-keys" keyid)
(insert "\n")
- (call-process "gpg" nil t t "--list-keys" keyid))
+ (call-process epg-gpg-program nil t t "--list-keys" keyid))
(recenter -1))
(notmuch-show-refresh-view)))
@@ -161,7 +169,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
@@ -173,3 +182,5 @@ mode."
;;
(provide 'notmuch-crypto)
+
+;;; notmuch-crypto.el ends here