X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epg.el;h=f4c2f8395203e446f643c03f704c56b5019d41a4;hb=f0cf0f951e5534b14c3a798424ff6fdc40ad39a8;hp=8a70d218f3424aa887caa353a391ff8cd4fa24ff;hpb=9d4481cdaffc16cd78edff44728d75add4a3741c;p=elisp%2Fepg.git

diff --git a/epg.el b/epg.el
index 8a70d21..f4c2f83 100644
--- a/epg.el
+++ b/epg.el
@@ -534,7 +534,6 @@ This function is for internal use only."
 	 (funcall (if (consp (epg-context-passphrase-callback epg-context))
 		      (car (epg-context-passphrase-callback epg-context))
 		    (epg-context-passphrase-callback epg-context))
-		  epg-key-id
 		  (if (consp (epg-context-passphrase-callback epg-context))
 		      (cdr (epg-context-passphrase-callback epg-context)))))
 	string)
@@ -717,16 +716,16 @@ This function is for internal use only."
        (cons (cons 'delete-problem (string-to-number (match-string 1 string)))
 	     (epg-context-result-for epg-context 'error)))))
 
-(defun epg-passphrase-callback-function (key-id handback)
+(defun epg-passphrase-callback-function (handback)
   (read-passwd
-   (if (eq key-id 'SYM)
+   (if (eq epg-key-id 'SYM)
        "Passphrase for symmetric encryption: "
-     (if (eq key-id 'PIN)
+     (if (eq epg-key-id 'PIN)
 	 "Passphrase for PIN: "
-       (let ((entry (assoc key-id epg-user-id-alist)))
+       (let ((entry (assoc epg-key-id epg-user-id-alist)))
 	 (if entry
-	     (format "Passphrase for %s %s: " key-id (cdr entry))
-	   (format "Passphrase for %s: " key-id)))))))
+	     (format "Passphrase for %s %s: " epg-key-id (cdr entry))
+	   (format "Passphrase for %s: " epg-key-id)))))))
 
 (defun epg-progress-callback-function (what char current total handback)
   (message "%s: %d%%/%d%%" what current total))