diff options
| author | Daiki Ueno <ueno@gnu.org> | 2016-06-09 17:30:00 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2016-06-09 17:56:29 +0900 |
| commit | 47b710a976d6e343d48b5170757a7971b0ac2966 (patch) | |
| tree | b34fc38dbf6afeb74f5941fb7a5b8587fc056491 /lisp/epg.el | |
| parent | cfacb7547d0f99c3c186a1c1ebb84ce42a04a428 (diff) | |
| download | emacs-47b710a976d6e343d48b5170757a7971b0ac2966.tar.gz | |
epg: don't use obsolete function
* lisp/epg.el (epg-sign-string, epg-encrypt-string): Remove
redundant configuration check, which is now done in
`epg-make-context'.
Diffstat (limited to 'lisp/epg.el')
| -rw-r--r-- | lisp/epg.el | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lisp/epg.el b/lisp/epg.el index d37db110be6..315eb40f0a4 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -1753,12 +1753,7 @@ If optional 3rd argument MODE is t or `detached', it makes a detached signature. If it is nil or `normal', it makes a normal signature. Otherwise, it makes a cleartext signature." (let ((input-file - (unless (or (eq (epg-context-protocol context) 'CMS) - (condition-case nil - (progn - (epg-check-configuration (epg-configuration)) - t) - (error))) + (unless (eq (epg-context-protocol context) 'CMS) (epg--make-temp-file "epg-input"))) (coding-system-for-write 'binary)) (unwind-protect @@ -1865,12 +1860,7 @@ If RECIPIENTS is nil, it performs symmetric encryption." If RECIPIENTS is nil, it performs symmetric encryption." (let ((input-file (unless (or (not sign) - (eq (epg-context-protocol context) 'CMS) - (condition-case nil - (progn - (epg-check-configuration (epg-configuration)) - t) - (error))) + (eq (epg-context-protocol context) 'CMS)) (epg--make-temp-file "epg-input"))) (coding-system-for-write 'binary)) (unwind-protect |