Fixed.

diff --git a/epg.el b/epg.el
index 4a41245..b2ac8f1 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -602,12 +602,12 @@ This function is for internal use only."
                (progn
                  (setq passphrase
                        (funcall
-                        epg-context
                         (if (consp (epg-context-passphrase-callback
                                     epg-context))
                             (car (epg-context-passphrase-callback
                                   epg-context))
                           (epg-context-passphrase-callback epg-context))
+                        epg-context
                         epg-key-id
                         (if (consp (epg-context-passphrase-callback
                                     epg-context))
@@ -773,10 +773,10 @@ This function is for internal use only."
 (defun epg-status-PROGRESS (process string)
   (if (string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)"
                    string)
-      (funcall epg-context
-              (if (consp (epg-context-progress-callback epg-context))
+      (funcall (if (consp (epg-context-progress-callback epg-context))
                   (car (epg-context-progress-callback epg-context))
                 (epg-context-progress-callback epg-context))
+              epg-context
               (match-string 1 string)
               (match-string 2 string)
               (string-to-number (match-string 3 string))