aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno2016-06-09 17:30:00 +0900
committerDaiki Ueno2016-06-09 17:56:29 +0900
commit47b710a976d6e343d48b5170757a7971b0ac2966 (patch)
treeb34fc38dbf6afeb74f5941fb7a5b8587fc056491
parentcfacb7547d0f99c3c186a1c1ebb84ce42a04a428 (diff)
downloademacs-47b710a976d6e343d48b5170757a7971b0ac2966.tar.gz
emacs-47b710a976d6e343d48b5170757a7971b0ac2966.zip
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'.
-rw-r--r--lisp/epg.el14
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.
1753If it is nil or `normal', it makes a normal signature. 1753If it is nil or `normal', it makes a normal signature.
1754Otherwise, it makes a cleartext signature." 1754Otherwise, it makes a cleartext signature."
1755 (let ((input-file 1755 (let ((input-file
1756 (unless (or (eq (epg-context-protocol context) 'CMS) 1756 (unless (eq (epg-context-protocol context) 'CMS)
1757 (condition-case nil
1758 (progn
1759 (epg-check-configuration (epg-configuration))
1760 t)
1761 (error)))
1762 (epg--make-temp-file "epg-input"))) 1757 (epg--make-temp-file "epg-input")))
1763 (coding-system-for-write 'binary)) 1758 (coding-system-for-write 'binary))
1764 (unwind-protect 1759 (unwind-protect
@@ -1865,12 +1860,7 @@ If RECIPIENTS is nil, it performs symmetric encryption."
1865If RECIPIENTS is nil, it performs symmetric encryption." 1860If RECIPIENTS is nil, it performs symmetric encryption."
1866 (let ((input-file 1861 (let ((input-file
1867 (unless (or (not sign) 1862 (unless (or (not sign)
1868 (eq (epg-context-protocol context) 'CMS) 1863 (eq (epg-context-protocol context) 'CMS))
1869 (condition-case nil
1870 (progn
1871 (epg-check-configuration (epg-configuration))
1872 t)
1873 (error)))
1874 (epg--make-temp-file "epg-input"))) 1864 (epg--make-temp-file "epg-input")))
1875 (coding-system-for-write 'binary)) 1865 (coding-system-for-write 'binary))
1876 (unwind-protect 1866 (unwind-protect