]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363).
authorNoam Postavsky <npostavs@gmail.com>
Fri, 27 Apr 2018 11:27:59 +0000 (07:27 -0400)
committerNoam Postavsky <npostavs@gmail.com>
Sun, 3 Jun 2018 01:18:46 +0000 (21:18 -0400)
(cherry picked from commit 217202c084232f36d4fa0fead0f3aca21396d074)

lisp/epa.el

index a84e4f2b8544c2042749cd154ad8dcbb0531f1e3..f2989b314a2092e7627d2ccad11b16b662f619dc 100644 (file)
@@ -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)