[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 0ac98cc 07/10: * lisp/epa.el (epa-decrypt-file):
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-26 0ac98cc 07/10: * lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363). |
Date: |
Sun, 3 Jun 2018 12:57:53 -0400 (EDT) |
branch: emacs-26
commit 0ac98cc6edf45e5acdf5d1bf79764745ec444381
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
* lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363).
(cherry picked from commit 217202c084232f36d4fa0fead0f3aca21396d074)
---
lisp/epa.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/lisp/epa.el b/lisp/epa.el
index a84e4f2..f2989b3 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)
- [Emacs-diffs] emacs-26 updated (5fa73a7 -> 9a14b4d), Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 71192e0 01/10: Don't wait for visible frames to become visible, Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 7460840 02/10: Fix CHECK_ALLOCATED_AND_LIVE abort during GC, Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 0ac98cc 07/10: * lisp/epa.el (epa-decrypt-file): Apply epa-pinentry-mode (Bug#30363).,
Noam Postavsky <=
- [Emacs-diffs] emacs-26 51ee8bc 04/10: Centralize Bug#30931 fix, Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 3ba5fc2 08/10: esh-opt.el: Fix improper parsing of first argument (Bug#28323), Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 9552485 06/10: Fix cl-print for circular sublists (Bug#31146), Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 daa6023 03/10: Fix another case of freed markers in the undo-list (Bug#30931), Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 ed962f2 09/10: Fix bug#30846, along with misc cleanups found along the way, Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 4c6cdf6 05/10: Revert "Make mail-extract-address-components return the user name more", Noam Postavsky, 2018/06/03
- [Emacs-diffs] emacs-26 9a14b4d 10/10: ; Merge: backports from master, Noam Postavsky, 2018/06/03