From: ueno <ueno>
Date: Mon, 17 Apr 2006 02:46:07 +0000 (+0000)
Subject: expand-file-name
X-Git-Tag: epgsm-branchpoint~63
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5259f450c9646ea3a636822d3cb899d10bc8ba58;p=elisp%2Fepg.git

expand-file-name
---

diff --git a/epa-dired.el b/epa-dired.el
index 74c3cff..4c1490a 100644
--- a/epa-dired.el
+++ b/epa-dired.el
@@ -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,7 +53,7 @@
   (interactive)
   (let ((file-list (dired-get-marked-files)))
     (while file-list
-      (epa-verify-file (car file-list))
+      (epa-verify-file (expand-file-name (car file-list)))
       (setq file-list (cdr file-list)))
     (revert-buffer)))
 
@@ -72,7 +72,7 @@
   (let ((file-list (dired-get-marked-files)))
     (while file-list
       (epa-encrypt-file
-       (car file-list)
+       (expand-file-name (car file-list))
        (mapcar (lambda (key)
 		 (epg-sub-key-id
 		  (car (epg-key-sub-key-list key))))
diff --git a/epa.el b/epa.el
index 100e02d..8e23cd5 100644
--- a/epa.el
+++ b/epa.el
@@ -357,12 +357,13 @@
 (defun epa-decrypt-file (file)
   (interactive "fFile: ")
   (let* ((default-name (file-name-sans-extension file))
-	 (plain (read-file-name
-		 (concat "To file (default "
-			 (file-name-nondirectory default-name)
-			 ") ")
-		 (file-name-directory default-name)
-		 default-name))
+	 (plain (expand-file-name
+		 (read-file-name
+		  (concat "To file (default "
+			  (file-name-nondirectory default-name)
+			  ") ")
+		  (file-name-directory default-name)
+		  default-name)))
 	 (context (epg-make-context)))
     (message "Decrypting %s..." (file-name-nondirectory file))
     (epg-decrypt-file context file plain)