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

diff --git a/epa-file.el b/epa-file.el
index 86af182..d4c9fb2 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 (file)
-  (if (eq epg-key-id 'SYM)
+(defun epa-file-passphrase-callback-function (key-id file)
+  (if (eq 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 nil))
+	      (setq passphrase (epg-passphrase-callback-function key-id nil))
 	      (setcdr entry (copy-sequence passphrase))
 	      passphrase)))
-    (epg-passphrase-callback-function nil)))
+    (epg-passphrase-callback-function key-id nil)))
 
 (defun epa-file-handler (operation &rest args)
   (save-match-data
@@ -135,12 +135,10 @@
 		   (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.  ")))))
+If no one is selected, symmetric encryption will be performed.  "))))
       (error
        (if (setq entry (assoc file epa-file-passphrase-alist))
 	   (setcdr entry nil))