X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa-file.el;h=86af182ee2955c67a5e7376103e8c287011ea18b;hb=f0cf0f951e5534b14c3a798424ff6fdc40ad39a8;hp=6ba67f252b23756e07991dde8474ec99f35fdf14;hpb=4970a9665ddbb13c26a070ea013ca65f8e4229a2;p=elisp%2Fepg.git

diff --git a/epa-file.el b/epa-file.el
index 6ba67f2..86af182 100644
--- a/epa-file.el
+++ b/epa-file.el
@@ -39,8 +39,8 @@
   
 (defvar epa-file-passphrase-alist nil)
 
-(defun epa-file-passphrase-callback-function (key-id file)
-  (if (eq key-id 'SYM)
+(defun epa-file-passphrase-callback-function (file)
+  (if (eq epg-key-id 'SYM)
       (let ((entry (assoc file epa-file-passphrase-alist))
 	    passphrase)
 	(or (copy-sequence (cdr entry))
@@ -49,10 +49,10 @@
 		(setq entry (list file)
 		      epa-file-passphrase-alist (cons entry
 						 epa-file-passphrase-alist)))
-	      (setq passphrase (epg-passphrase-callback-function key-id nil))
+	      (setq passphrase (epg-passphrase-callback-function nil))
 	      (setcdr entry (copy-sequence passphrase))
 	      passphrase)))
-    (epg-passphrase-callback-function key-id nil)))
+    (epg-passphrase-callback-function nil)))
 
 (defun epa-file-handler (operation &rest args)
   (save-match-data