X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-crypto.el;h=353f721e2593c2fb977612a088d1378534e7ee21;hb=3c752b855f900f5251df9997514b4d27d9f38e83;hp=83e5d37aa4a939fbe366076f8d7b16c3b698685a;hpb=ad6a6edb38e428f7bbcd81b49fd2ef1e5197f8c7;p=notmuch
diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 83e5d37a..353f721e 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,11 +15,16 @@
;; 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
-(defcustom notmuch-crypto-process-mime nil
+;;; Code:
+
+(require 'epg)
+(require 'notmuch-lib)
+
+(defcustom notmuch-crypto-process-mime t
"Should cryptographic MIME parts be processed?
If this variable is non-nil signatures in multipart/signed
@@ -35,10 +40,16 @@ providing a prefix when viewing a signed or encrypted message, or
by providing a prefix when reloading the message in notmuch-show
mode."
:type 'boolean
+ :package-version '(notmuch . "0.25")
: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)
@@ -76,7 +87,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))
@@ -107,8 +119,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
@@ -130,7 +142,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 "--batch" "--no-tty" "--list-keys" fingerprint))
(recenter -1))))
(defun notmuch-crypto-sigstatus-error-callback (button)
@@ -141,9 +153,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 "--batch" "--no-tty" "--recv-keys" keyid)
(insert "\n")
- (call-process "gpg" nil t t "--list-keys" keyid))
+ (call-process epg-gpg-program nil t t "--batch" "--no-tty" "--list-keys" keyid))
(recenter -1))
(notmuch-show-refresh-view)))
@@ -158,7 +170,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
@@ -170,3 +183,5 @@ mode."
;;
(provide 'notmuch-crypto)
+
+;;; notmuch-crypto.el ends here