(require 'epg)
(require 'notmuch-lib)
-(defcustom notmuch-crypto-process-mime nil
+(defcustom notmuch-crypto-process-mime t
"Should cryptographic MIME parts be processed?
If this variable is non-nil signatures in multipart/signed
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
(defun notmuch-crypto-insert-sigstatus-button (sigstatus from)
(let* ((status (plist-get sigstatus :status))
(help-msg nil)
- (label "Signature not processed")
+ (show-button t)
+ (label nil)
(face 'notmuch-crypto-signature-unknown)
(button-action (lambda (button) (message (button-get button 'help-echo)))))
(cond
(let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
(setq label (concat "Bad signature (claimed key ID " keyid ")"))
(setq face 'notmuch-crypto-signature-bad)))
+ (status
+ (setq label (concat "Unknown signature status: " status)))
(t
- (setq label (concat "Unknown signature status"
- (if status (concat ": " status))))))
- (insert-button
- (concat "[ " label " ]")
- :type 'notmuch-crypto-status-button-type
- 'help-echo help-msg
- 'face face
- 'mouse-face face
- 'action button-action
- :notmuch-sigstatus sigstatus
- :notmuch-from from)
- (insert "\n")))
+ (setq show-button nil)))
+ (when show-button
+ (insert-button
+ (concat "[ " label " ]")
+ :type 'notmuch-crypto-status-button-type
+ 'help-echo help-msg
+ 'face face
+ 'mouse-face face
+ 'action button-action
+ :notmuch-sigstatus sigstatus
+ :notmuch-from from)
+ (insert "\n"))))
(declare-function notmuch-show-refresh-view "notmuch-show" (&optional reset-state))
(with-selected-window window
(with-current-buffer buffer
(goto-char (point-max))
- (call-process epg-gpg-program 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)
(with-selected-window window
(with-current-buffer buffer
(goto-char (point-max))
- (call-process epg-gpg-program nil t t "--recv-keys" keyid)
+ (call-process epg-gpg-program nil t t "--batch" "--no-tty" "--recv-keys" keyid)
(insert "\n")
- (call-process epg-gpg-program 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)))