From: Noam Postavsky <npostavs@gmail.com>
Date: Fri, 27 Apr 2018 11:27:59 +0000 (-0400)
Subject: * lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363).
X-Git-Tag: emacs-26.1.90~396^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ac98cc;p=emacs.git

* lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363).

(cherry picked from commit 217202c084232f36d4fa0fead0f3aca21396d074)
---

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)