X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa-dired.el;h=aa4e40645cc7ab3a4c85c59f6c9c69e8c5d77d76;hb=2e8cf939a067948d210ebbf01576000de13c970c;hp=74c3cfff805b6ab2cd18299ac3089631840279aa;hpb=d861bb898f66f6e8709091a1a1dd9c4a0968a5df;p=elisp%2Fepg.git

diff --git a/epa-dired.el b/epa-dired.el
index 74c3cff..aa4e406 100644
--- a/epa-dired.el
+++ b/epa-dired.el
@@ -1,4 +1,4 @@
-;;; epa-dired.el --- the EasyPG Assistant as a dired extension
+;;; epa-dired.el --- the EasyPG Assistant, dired extension
 ;; Copyright (C) 2006 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -44,7 +44,7 @@
   (interactive)
   (let ((file-list (dired-get-marked-files)))
     (while file-list
-      (epa-decrypt-file (car file-list))
+      (epa-decrypt-file (expand-file-name (car file-list)))
       (setq file-list (cdr file-list)))
     (revert-buffer)))
 
@@ -53,16 +53,20 @@
   (interactive)
   (let ((file-list (dired-get-marked-files)))
     (while file-list
-      (epa-verify-file (car file-list))
-      (setq file-list (cdr file-list)))
-    (revert-buffer)))
+      (epa-verify-file (expand-file-name (car file-list)))
+      (setq file-list (cdr file-list)))))
 
-(defun epa-dired-do-sign (&optional detached)
+(defun epa-dired-do-sign ()
   "Sign marked files."
-  (interactive "P")
+  (interactive)
   (let ((file-list (dired-get-marked-files)))
     (while file-list
-      (epa-sign-file (expand-file-name (car file-list)) detached)
+      (epa-sign-file
+       (expand-file-name (car file-list))
+       (epa-select-keys (epg-make-context) "Select keys for signing.
+If no one is selected, default secret key is used.  "
+			nil t)
+       (y-or-n-p "Make a detached signature? "))
       (setq file-list (cdr file-list)))
     (revert-buffer)))
 
@@ -72,12 +76,9 @@
   (let ((file-list (dired-get-marked-files)))
     (while file-list
       (epa-encrypt-file
-       (car file-list)
-       (mapcar (lambda (key)
-		 (epg-sub-key-id
-		  (car (epg-key-sub-key-list key))))
-	       (epa-select-keys "Select recipents for encryption.
-If no one is selected, symmetric encryption will be performed.  ")))
+       (expand-file-name (car file-list))
+       (epa-select-keys (epg-make-context) "Select recipents for encryption.
+If no one is selected, symmetric encryption will be performed.  "))
       (setq file-list (cdr file-list)))
     (revert-buffer)))