Allow the user to specify the gpg program to use when retrieving keys,
etc., defaulting to the value of `epg-gpg-program'.
---
emacs/notmuch-crypto.el | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index f128f30e..99087d0b 100644
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -48,6 +48,11 @@ mode."
:type 'boolean
:group 'notmuch-crypto)
+(defcustom notmuch-crypto-gpg-program epg-gpg-program
+ "The gpg executable."
+ :type 'string
+ :group 'notmuch-crypto)
+
(defface notmuch-crypto-part-header
'((((class color)
(background dark))
@@ -149,7 +154,7 @@ by user FROM."
(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 notmuch-crypto-gpg-program nil t t "--list-keys"
fingerprint))
(recenter -1))))
(declare-function notmuch-show-refresh-view "notmuch-show" (&optional
reset-state))
@@ -206,7 +211,7 @@ corresponding key when the status button is pressed."
button (format "Retrieving key %s asynchronously..." keyid))
(let ((p (make-process :name "notmuch GPG key retrieval"
:buffer buffer
- :command (list epg-gpg-program "--recv-keys"
keyid)
+ :command (list notmuch-crypto-gpg-program
"--recv-keys" keyid)
:connection-type 'pipe
:sentinel #'notmuch-crypto--async-key-sentinel
;; Create the process stopped so that
@@ -218,13 +223,14 @@ corresponding key when the status button is pressed."
(process-put p :notmuch-show-point (point))
(message "Getting the GPG key %s asynchronously..." keyid)
(continue-process p)))
+
(let ((window (display-buffer buffer)))
(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 notmuch-crypto-gpg-program nil t t "--recv-keys"
keyid)
(insert "\n")
- (call-process epg-gpg-program nil t t "--list-keys" keyid))
+ (call-process notmuch-crypto-gpg-program nil t t "--list-keys"
keyid))
(recenter -1))
(notmuch-show-refresh-view)))))
--
2.19.0
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch
