summaryrefslogtreecommitdiff
path: root/lisp/epg.el
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2015-06-18 10:08:04 +0900
committerDaiki Ueno <ueno@gnu.org>2015-06-18 10:22:38 +0900
commitdbc192b4c239c2da8c83def0b0a877d7f179172a (patch)
tree0c86eb8250d1886c190da6831bb3e61221b35ac3 /lisp/epg.el
parent5dc72bc4ba6963c5896daa42e6193d6ae667dc1d (diff)
downloademacs-dbc192b4c239c2da8c83def0b0a877d7f179172a.tar.gz
Add pinentry.el for better GnuPG integration
* lisp/pinentry.el: New file. * etc/NEWS: Add entry about pinentry.el. * lisp/epg.el (epg--start): Set INSIDE_EMACS envvar. Fixes: debbugs:20550
Diffstat (limited to 'lisp/epg.el')
-rw-r--r--lisp/epg.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/epg.el b/lisp/epg.el
index 601504882e6..b3d39bb8505 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -602,6 +602,9 @@ callback data (if any)."
(setq process-environment
(cons (concat "GPG_TTY=" terminal-name)
(cons "TERM=xterm" process-environment))))
+ (setq 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