emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 47b710a 2/2: epg: don't use obsolete function


From: Daiki Ueno
Subject: [Emacs-diffs] master 47b710a 2/2: epg: don't use obsolete function
Date: Thu, 9 Jun 2016 08:56:47 +0000 (UTC)

branch: master
commit 47b710a976d6e343d48b5170757a7971b0ac2966
Author: Daiki Ueno <address@hidden>
Commit: Daiki Ueno <address@hidden>

    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'.
---
 lisp/epg.el |   14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/lisp/epg.el b/lisp/epg.el
index d37db11..315eb40 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]