diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-04-29 10:32:03 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-05-23 07:53:58 -0400 |
| commit | 302e500087fd4cc1c5f37ec87c98e828b22aaa05 (patch) | |
| tree | b9367f87996ecddb79c3e8f2b5a487f66cf2f8cb /lisp/epa-file.el | |
| parent | 21ab346a07eff8ba43cb2738dc6752f012b77670 (diff) | |
| download | emacs-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/epa-file.el')
| -rw-r--r-- | lisp/epa-file.el | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lisp/epa-file.el b/lisp/epa-file.el index 1de2f9ba2d8..866a4ae03a7 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -147,7 +147,6 @@ encryption is used." context (cons #'epa-progress-callback-function (format "Decrypting %s" file))) - (setf (epg-context-pinentry-mode context) epa-pinentry-mode) (unwind-protect (progn (if replace @@ -236,7 +235,6 @@ encryption is used." (cons #'epa-progress-callback-function (format "Encrypting %s" file))) (setf (epg-context-armor context) epa-armor) - (setf (epg-context-pinentry-mode context) epa-pinentry-mode) (condition-case error (setq string (epg-encrypt-string |