debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-28 13:44:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: use epg-gpg-program

Browse source 
Adjusted notmuch-crypto gpg call-process function to respect
the GPG program set by the EasyPG epg-gpg-program variable.

This is to correct a problem observed on NixOS where only gpg2 is
installed by default. The Notmuch Emacs frontend fails when trying to
access someone's key to verify their signature when it cannot find the
GPG binary.
This commit is contained in:
John Byrnes 2017-03-12 21:26:16 +02:00 committed by David Bremner
parent c0c5645538
commit f0d06c8ca3
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
emacs/notmuch-crypto.el
View file

@ -21,6 +21,7 @@
;;; Code: ;;; Code:
(require 'epg)
(require 'notmuch-lib) (require 'notmuch-lib)
(defcustom notmuch-crypto-process-mime nil (defcustom notmuch-crypto-process-mime nil
@ -140,7 +141,7 @@ mode."
(with-selected-window window (with-selected-window window
(with-current-buffer buffer (with-current-buffer buffer
(goto-char (point-max)) (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)))) (recenter -1))))
(defun notmuch-crypto-sigstatus-error-callback (button) (defun notmuch-crypto-sigstatus-error-callback (button)
@ -151,9 +152,9 @@ mode."
(with-selected-window window (with-selected-window window
(with-current-buffer buffer (with-current-buffer buffer
(goto-char (point-max)) (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") (insert "\n")
(call-process "gpg" nil t t "--list-keys" keyid)) (call-process epg-gpg-program nil t t "--list-keys" keyid))
(recenter -1)) (recenter -1))
(notmuch-show-refresh-view))) (notmuch-show-refresh-view)))