mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-26 10:49:33 +00:00
Code Issues Releases Activity

epg: don't use obsolete function

Browse Source 
* lisp/epg.el (epg-sign-string, epg-encrypt-string): Remove
redundant configuration check, which is now done in
`epg-make-context'.
This commit is contained in:
Daiki Ueno 2016-06-09 17:30:00 +09:00
parent cfacb7547d
commit 47b710a976
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/epg.el
View File

@ -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