X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pgg-epg.el;h=bc093bbadcf048d8e32d9ff3d4062bb66cab32cf;hb=5312c05cb5a923991a4d5ab8de4b9fc53d21f0d2;hp=1c8a1332426ddc6a515714c61e1309547d8ba047;hpb=75f1f5eb5623d49dcc05dfb8c2428e1d37d60df7;p=elisp%2Fepg.git

diff --git a/pgg-epg.el b/pgg-epg.el
index 1c8a133..bc093bb 100644
--- a/pgg-epg.el
+++ b/pgg-epg.el
@@ -92,41 +92,37 @@ passphrase cache or user."
     (epg-context-set-textmode context pgg-text-mode)
     (setq signature (epg-sign-string context (buffer-substring start end)
 				     (if cleartext
-					 'cleartext
+					 'clearsign
 				       'detached)))
     (save-excursion
       (set-buffer (get-buffer-create pgg-output-buffer))
+      (erase-buffer)
       (insert signature))
     t))
 
-(defvar pgg-epg-signature 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))
-	pointer)
+  (let ((context (epg-make-context)))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
     (if signature
-	(epg-verify-file context signature (buffer-substring start end) nil)
+	(epg-verify-string context
+			   (with-temp-buffer
+			     (insert-file-contents signature)
+			     (buffer-string))
+			   (buffer-substring start end))
       (epg-verify-string context (buffer-substring start end)))
-    (setq signature (reverse (epg-context-result-for context 'verify))
-	  pointer signature)
     (save-excursion
       (set-buffer (get-buffer-create pgg-errors-buffer))
-      (make-local-variable 'pgg-epg-signature)
-      (setq pgg-epg-signature (car signature))
+      (make-local-variable 'pgg-epg-signatures)
+      (setq pgg-epg-signatures (epg-context-result-for context 'verify))
       (erase-buffer)
-      (while pointer
-	(insert (format "%s: %s %s %s\n"
-			(epg-signature-status (car pointer))
-			(epg-signature-key-id (car pointer))
-			(epg-signature-user-id (car pointer))
-			(epg-signature-validity (car pointer))))
-	(setq pointer (cdr pointer))))
-    signature))
+      (insert (epg-verify-result-to-string pgg-epg-signatures)))
+    t))
 
 (defun pgg-epg-insert-key ()
   "This function is for internal use only.