summaryrefslogtreecommitdiff
path: root/lisp/epg.el
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2018-04-29 10:32:03 -0400
committerNoam Postavsky <npostavs@gmail.com>2018-05-23 07:53:58 -0400
commit302e500087fd4cc1c5f37ec87c98e828b22aaa05 (patch)
treeb9367f87996ecddb79c3e8f2b5a487f66cf2f8cb /lisp/epg.el
parent21ab346a07eff8ba43cb2738dc6752f012b77670 (diff)
downloademacs-302e500087fd4cc1c5f37ec87c98e828b22aaa05.tar.gz
emacs-302e500087fd4cc1c5f37ec87c98e828b22aaa05.tar.bz2
emacs-302e500087fd4cc1c5f37ec87c98e828b22aaa05.zip
Move epa-pinentry-mode to epg-config (Bug#26298)
* lisp/epa.el (epa-pinentry-mode): Make into obsolete alias for... * lisp/epg-config.el (epg-pinentry-mode): ...this new user option. * lisp/epg.el (epg-context): Use it as the default value for pinentry-mode. * etc/NEWS: Announce name change. * lisp/epa-file.el (epa-file-insert-file-contents) (epa-file-write-region): * lisp/epa.el (epa-decrypt-file, epa-sign-file) (epa-encrypt-file, epa-decrypt-region) (epa-sign-region, epa-encrypt-region): Don't change epg-context-pinentry-mode from the default.
Diffstat (limited to 'lisp/epg.el')
-rw-r--r--lisp/epg.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/epg.el b/lisp/epg.el
index e6b4af2b36e..f79f2046ded 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -207,7 +207,7 @@
output-file
result
operation
- pinentry-mode
+ (pinentry-mode epg-pinentry-mode)
(error-output "")
error-buffer)