diff options
| author | Noam Postavsky | 2018-04-27 07:27:59 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2018-06-03 12:48:14 -0400 |
| commit | 0ac98cc6edf45e5acdf5d1bf79764745ec444381 (patch) | |
| tree | c57dd7ad5b028ef2f05faa01b7dcb04dc0580cc8 | |
| parent | 9552485c4d471a02cd3973d4458d8513a81f9c85 (diff) | |
| download | emacs-0ac98cc6edf45e5acdf5d1bf79764745ec444381.tar.gz emacs-0ac98cc6edf45e5acdf5d1bf79764745ec444381.zip | |
* lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363).
(cherry picked from commit 217202c084232f36d4fa0fead0f3aca21396d074)
| -rw-r--r-- | lisp/epa.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/epa.el b/lisp/epa.el index a84e4f2b854..f2989b314a2 100644 --- a/lisp/epa.el +++ b/lisp/epa.el | |||
| @@ -701,6 +701,7 @@ If you do not specify PLAIN-FILE, this functions prompts for the value to use." | |||
| 701 | #'epa-progress-callback-function | 701 | #'epa-progress-callback-function |
| 702 | (format "Decrypting %s..." | 702 | (format "Decrypting %s..." |
| 703 | (file-name-nondirectory decrypt-file)))) | 703 | (file-name-nondirectory decrypt-file)))) |
| 704 | (setf (epg-context-pinentry-mode context) epa-pinentry-mode) | ||
| 704 | (message "Decrypting %s..." (file-name-nondirectory decrypt-file)) | 705 | (message "Decrypting %s..." (file-name-nondirectory decrypt-file)) |
| 705 | (condition-case error | 706 | (condition-case error |
| 706 | (epg-decrypt-file context decrypt-file plain-file) | 707 | (epg-decrypt-file context decrypt-file plain-file) |