Reverted.

[elisp/epg.git] / epa.el

diff --git a/epa.el b/epa.el
index 6549e40..c95480e 100644 (file)
--- 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