mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-21 18:38:08 +01:00
emacs: Add notmuch-crypto-gpg-program and use it
Allow the user to specify the gpg program to use when retrieving keys, etc., defaulting to the value of `epg-gpg-program'.
This commit is contained in:
parent
50f0cbcc4d
commit
d137afface
1 changed files with 10 additions and 4 deletions
|
@ -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))
|
||||
|
@ -151,7 +156,7 @@ by user FROM."
|
|||
(with-selected-window window
|
||||
(with-current-buffer buffer
|
||||
(goto-char (point-max))
|
||||
(call-process epg-gpg-program nil t t "--batch" "--no-tty" "--list-keys" fingerprint))
|
||||
(call-process notmuch-crypto-gpg-program nil t t "--batch" "--no-tty" "--list-keys" fingerprint))
|
||||
(recenter -1))))
|
||||
|
||||
(declare-function notmuch-show-refresh-view "notmuch-show" (&optional reset-state))
|
||||
|
@ -208,7 +213,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
|
||||
|
@ -220,13 +225,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)))))
|
||||
|
||||
|
|
Loading…
Reference in a new issue