Remove auto-autoloads.el~

[elisp/epg.git] / pgg-epg.el

diff --git a/pgg-epg.el b/pgg-epg.el
index 6153f0b..bc093bb 100644 (file)
--- a/pgg-epg.el
+++ b/pgg-epg.el
@@ -100,14 +100,13 @@ passphrase cache or user."
       (insert signature))
     t))
 
-(defvar pgg-epg-verify-results nil)
+(defvar pgg-epg-signatures nil)
 
 (defun pgg-epg-verify-region (start end &optional signature)
   "This function is for internal use only.
 
 Verify region between START and END as the detached signature SIGNATURE."
-  (let ((context (epg-make-context))
-       verify-results)
+  (let ((context (epg-make-context)))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
     (if signature
@@ -117,13 +116,12 @@ Verify region between START and END as the detached signature SIGNATURE."
                             (buffer-string))
                           (buffer-substring start end))
       (epg-verify-string context (buffer-substring start end)))
-    (setq verify-results (reverse (epg-context-result-for context 'verify)))
     (save-excursion
       (set-buffer (get-buffer-create pgg-errors-buffer))
-      (make-local-variable 'pgg-epg-verify-results)
-      (setq pgg-epg-verify-results (car verify-results))
+      (make-local-variable 'pgg-epg-signatures)
+      (setq pgg-epg-signatures (epg-context-result-for context 'verify))
       (erase-buffer)
-      (insert (mapconcat #'epg-verify-result-to-string verify-results "\n")))
+      (insert (epg-verify-result-to-string pgg-epg-signatures)))
     t))
 
 (defun pgg-epg-insert-key ()
@@ -146,15 +144,15 @@ Add all public keys in region between START and END to the keyring."
     (epg-context-set-textmode context pgg-text-mode)
     (epg-import-keys context (buffer-substring start end))))
 
-(defun mml2015-gpg-extract-verify-result-details ()
-  (if pgg-epg-verify-result
-      (let* ((expired (eq (epg-verify-result-status pgg-epg-verify-result)
+(defun mml2015-gpg-extract-signature-details ()
+  (if pgg-epg-signature
+      (let* ((expired (eq (epg-signature-status pgg-epg-signature)
                          'key-expired))
-            (signer (cons (epg-verify-result-key-id pgg-epg-verify-result)
-                          (epg-verify-result-user-id pgg-epg-verify-result)))
-            (fprint (epg-verify-result-fingerprint pgg-epg-verify-result))
+            (signer (cons (epg-signature-key-id pgg-epg-signature)
+                          (epg-signature-user-id pgg-epg-signature)))
+            (fprint (epg-signature-fingerprint pgg-epg-signature))
             (trust-good-enough-p
-             (memq (epg-verify-result-validity pgg-epg-verify-result)
+             (memq (epg-signature-validity pgg-epg-signature)
                    '(marginal fully ultimate))))
        (cond ((and signer fprint)
               (concat (cdr signer)