From 5d72d5d1f4d105556196d99f0ea3838dfedd2f10 Mon Sep 17 00:00:00 2001 From: Ivan Andrus Date: Thu, 16 Jul 2015 15:44:20 -0600 Subject: [PATCH] * epg.el (epg--start): Check that gpgconf can be found before calling it. --- lisp/epg.el | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lisp/epg.el b/lisp/epg.el index 4ba96272aae..7e3cec7b2b7 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -605,16 +605,17 @@ callback data (if any)." ;; Start the Emacs Pinentry server if allow-emacs-pinentry is set ;; in ~/.gnupg/gpg-agent.conf. (when (and (fboundp 'pinentry-start) - (with-temp-buffer - (when (= (call-process epg-gpgconf-program nil t nil - "--list-options" "gpg-agent") - 0) - (goto-char (point-min)) - (re-search-forward "^allow-emacs-pinentry:.*:1$" nil t)))) + (executable-find epg-gpgconf-program) + (with-temp-buffer + (when (= (call-process epg-gpgconf-program nil t nil + "--list-options" "gpg-agent") + 0) + (goto-char (point-min)) + (re-search-forward "^allow-emacs-pinentry:.*:1$" nil t)))) (pinentry-start)) (setq process-environment - (cons (format "INSIDE_EMACS=%s,epg" emacs-version) - process-environment)) + (cons (format "INSIDE_EMACS=%s,epg" emacs-version) + process-environment)) ;; Record modified time of gpg-agent socket to restore the Emacs ;; frame on text terminal in `epg-wait-for-completion'. ;; See -- 2.11.4.GIT