summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2018-04-27 07:27:59 -0400
committerNoam Postavsky <npostavs@gmail.com>2018-06-02 21:18:46 -0400
commitc1a55466bc27d066af24ef115b23ea0ccff78428 (patch)
tree44947a9c886fb2e462554e8c7430b0182cb4627a
parent0058ef3ad5fe6b8c20ce383dfe48363e9363575c (diff)
downloademacs-c1a55466bc27d066af24ef115b23ea0ccff78428.tar.gz
* lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363).
(cherry picked from commit 217202c084232f36d4fa0fead0f3aca21396d074)
-rw-r--r--lisp/epa.el1
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."
#'epa-progress-callback-function
(format "Decrypting %s..."
(file-name-nondirectory decrypt-file))))
+ (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
(message "Decrypting %s..." (file-name-nondirectory decrypt-file))
(condition-case error
(epg-decrypt-file context decrypt-file plain-file)