diff options
| author | Daiki Ueno <ueno@gnu.org> | 2014-11-18 14:49:30 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-11-18 14:53:54 +0900 |
| commit | 5224be2f7401bd9999b5442a94d0b2abf7f4da3b (patch) | |
| tree | 413f1682a2061840c1c897629a6686827ba21e67 /lisp/epa-file.el | |
| parent | b12bb4dc3ecc74c99031538fc8d3565d276a18d7 (diff) | |
| download | emacs-5224be2f7401bd9999b5442a94d0b2abf7f4da3b.tar.gz | |
epg: Simplify epa-pinentry-mode handling
* epa-file.el (epa-file-insert-file-contents)
(epa-file-write-region): Remove redundant check of
epa-pinentry-mode.
* epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region)
(epa-sign-region, epa-encrypt-region): Remove redundant check of
epa-pinentry-mode.
Diffstat (limited to 'lisp/epa-file.el')
| -rw-r--r-- | lisp/epa-file.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/epa-file.el b/lisp/epa-file.el index cdaa8ba5f3d..2e46cf9da24 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -144,8 +144,7 @@ encryption is used." context (cons #'epa-progress-callback-function (format "Decrypting %s" file))) - (if epa-pinentry-mode - (setf (epg-context-pinentry-mode context) epa-pinentry-mode)) + (setf (epg-context-pinentry-mode context) epa-pinentry-mode) (unwind-protect (progn (if replace @@ -233,8 +232,7 @@ encryption is used." (cons #'epa-progress-callback-function (format "Encrypting %s" file))) (setf (epg-context-armor context) epa-armor) - (if epa-pinentry-mode - (setf (epg-context-pinentry-mode context) epa-pinentry-mode)) + (setf (epg-context-pinentry-mode context) epa-pinentry-mode) (condition-case error (setq string (epg-encrypt-string |