Fixed.

diff --git a/epg.el b/epg.el
index f83c600..9fd321f 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -1196,8 +1196,8 @@ This function is for internal use only."
                                        (match-string 1 string))))
                           (if (match-beginning 2)
                               (list (cons 'fingerprint
                                        (match-string 1 string))))
                           (if (match-beginning 2)
                               (list (cons 'fingerprint

-                                          (match-string 3 string)))))
-                  (epg-context-result-for epg-context 'error))))))
+                                          (match-string 3 string))))))
+            (epg-context-result-for epg-context 'error)))))

 
 (defun epg-passphrase-callback-function (context key-id handback)
   (read-passwd
 
 (defun epg-passphrase-callback-function (context key-id handback)
   (read-passwd

@@ -1854,7 +1854,7 @@ If you are unsure, use synchronous version of this function
 KEYS is a list of key IDs"
   (unwind-protect
       (progn
 KEYS is a list of key IDs"
   (unwind-protect
       (progn

-       (epg-start-receive-keys context (epg-make-data-from-file parameters))
+       (epg-start-receive-keys context keys)

        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
            (error "Import keys failed: %S"
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
            (error "Import keys failed: %S"