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

diff --git a/epa-file.el b/epa-file.el
index 6ba67f2..a489bab 100644
--- a/epa-file.el
+++ b/epa-file.el
@@ -39,7 +39,7 @@
   
 (defvar epa-file-passphrase-alist nil)
 
-(defun epa-file-passphrase-callback-function (key-id file)
+(defun epa-file-passphrase-callback-function (context key-id file)
   (if (eq key-id 'SYM)
       (let ((entry (assoc file epa-file-passphrase-alist))
 	    passphrase)
@@ -49,10 +49,11 @@
 		(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 context
+								 key-id nil))
 	      (setcdr entry (copy-sequence passphrase))
 	      passphrase)))
-    (epg-passphrase-callback-function key-id nil)))
+    (epg-passphrase-callback-function context key-id nil)))
 
 (defun epa-file-handler (operation &rest args)
   (save-match-data
@@ -135,12 +136,11 @@
 		   (encode-coding-string start coding-system)
 		 (encode-coding-string (buffer-substring start end)
 				       coding-system))
-	       (mapcar (lambda (key)
-			 (epg-sub-key-id (car (epg-key-sub-key-list key))))
-		       (unless (assoc file epa-file-passphrase-alist)
+	       (unless (assoc file epa-file-passphrase-alist)
 			 (epa-select-keys
-		    "Select recipents for encryption.
-If no one is selected, symmetric encryption will be performed.  ")))))
+			  context
+			  "Select recipents for encryption.
+If no one is selected, symmetric encryption will be performed.  "))))
       (error
        (if (setq entry (assoc file epa-file-passphrase-alist))
 	   (setcdr entry nil))