From f0d06c8ca3fce15c9e264445485bd93a6de8d25e Mon Sep 17 00:00:00 2001
From: John Byrnes <john@johnbyrnes.info>
Date: Sun, 12 Mar 2017 21:26:16 +0200
Subject: [PATCH] emacs: use epg-gpg-program
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.
---
emacs/notmuch-crypto.el | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 68a7e9f3..0af727ef 100644
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -21,6 +21,7 @@
;;; Code:
+(require 'epg)
(require 'notmuch-lib)
(defcustom notmuch-crypto-process-mime nil
@@ -140,7 +141,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 "--list-keys" fingerprint))
(recenter -1))))
(defun notmuch-crypto-sigstatus-error-callback (button)
@@ -151,9 +152,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 "--recv-keys" keyid)
(insert "\n")
- (call-process "gpg" nil t t "--list-keys" keyid))
+ (call-process epg-gpg-program nil t t "--list-keys" keyid))
(recenter -1))
(notmuch-show-refresh-view)))
--
2.45.2