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.

diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 68a7e9f3735a814ce70b55948c3cf6ade687aea9..0af727ef4dc68258b039691e0e85d58e95f48a72 100644 (file)
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -21,6 +21,7 @@
 
 ;;; Code:
 
 
 ;;; Code:
 

+(require 'epg)

 (require 'notmuch-lib)
 
 (defcustom notmuch-crypto-process-mime nil
 (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))
     (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)
       (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))
     (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")
        (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)))
 
       (recenter -1))
     (notmuch-show-refresh-view)))