X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=epa.el;h=c95480ec67e36a5d222e25c8ba663e72d422ee44;hb=a2a5804f19009b4e01acfe3ca481feaa2266cb6d;hp=6549e40f8f1c0342f7d8ab387953a7e0e1ca2909;hpb=1fe277497593c8fee7d6623917a8f249538a9888;p=elisp%2Fepg.git

diff --git a/epa.el b/epa.el
index 6549e40..c95480e 100644
--- a/epa.el
+++ b/epa.el
@@ -302,6 +302,12 @@
       (erase-buffer)
       (insert prompt "\n")
       (widget-create 'link
+		     :notify (lambda (&rest ignore) (abort-recursive-edit))
+		     :help-echo
+		     (substitute-command-keys
+		      "Click here or \\[abort-recursive-edit] to cancel")
+		     "Cancel")
+      (widget-create 'link
 		     :notify (lambda (&rest ignore) (exit-recursive-edit))
 		     :help-echo
 		     (substitute-command-keys
@@ -432,15 +438,13 @@
   (interactive "fFile: ")
   (let* ((context (epg-make-context))
 	 (plain (if (equal (file-name-extension file) "sig")
-		    (file-name-sans-extension file)))
-	 signature)
+		    (file-name-sans-extension file))))
     (message "Verifying %s..." (file-name-nondirectory file))
     (epg-verify-file context file plain)
     (message "Verifying %s...done" (file-name-nondirectory file))
     (message "%s"
-	     (mapconcat #'epg-signature-to-string
-			(reverse (epg-context-result-for context 'verify))
-			"\n"))))
+	     (epg-verify-result-to-string
+	      (epg-context-result-for context 'verify)))))
 
 (defun epa-sign-file (file detached)
   (interactive