projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9552485
)
* lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363).
author
Noam Postavsky
<npostavs@gmail.com>
Fri, 27 Apr 2018 11:27:59 +0000
(07:27 -0400)
committer
Noam Postavsky
<npostavs@gmail.com>
Sun, 3 Jun 2018 16:48:14 +0000
(12:48 -0400)
(cherry picked from commit
217202c084232f36d4fa0fead0f3aca21396d074
)
lisp/epa.el
patch
|
blob
|
history
diff --git
a/lisp/epa.el
b/lisp/epa.el
index a84e4f2b8544c2042749cd154ad8dcbb0531f1e3..f2989b314a2092e7627d2ccad11b16b662f619dc 100644
(file)
--- 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)