From: ueno <ueno>
Date: Sun, 12 Nov 2006 08:13:04 +0000 (+0000)
Subject: * epa.el (epa-decrypt-file): Expand file name.
X-Git-Tag: epg-0_0_8~17
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=dfd45f01457bf29428a511b21baf6b666c3915b6;p=elisp%2Fepg.git

* epa.el (epa-decrypt-file): Expand file name.
(epa-verify-file): Ditto.
(epa-import-keys): Ditto.
---

diff --git a/ChangeLog b/ChangeLog
index 94ae19c..5e513d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-11-12  Daiki Ueno  <ueno@unixuser.org>
 
+	* epa.el (epa-decrypt-file): Expand file name.
+	(epa-verify-file): Ditto.
+	(epa-import-keys): Ditto.
+
+2006-11-12  Daiki Ueno  <ueno@unixuser.org>
+
 	* epg.el (epg-delete-keys): Decode delete-problem.
 
 	* epa.el (epa-popup-info-window): Turn on by default.
diff --git a/epa.el b/epa.el
index d38c391..f021520 100644
--- a/epa.el
+++ b/epa.el
@@ -563,6 +563,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
 (defun epa-decrypt-file (file)
   "Decrypt FILE."
   (interactive "fFile: ")
+  (setq file (expand-file-name file))
   (let* ((default-name (file-name-sans-extension file))
 	 (plain (expand-file-name
 		 (read-file-name
@@ -587,6 +588,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
 (defun epa-verify-file (file)
   "Verify FILE."
   (interactive "fFile: ")
+  (setq file (expand-file-name file))
   (let* ((context (epg-make-context))
 	 (plain (if (equal (file-name-extension file) "sig")
 		    (file-name-sans-extension file))))
@@ -827,11 +829,12 @@ Don't use this command in Lisp programs!"
 
 Don't use this command in Lisp programs!"
   (interactive "fFile: ")
+  (setq file (expand-file-name file))
   (let ((context (epg-make-context)))
     (message "Importing %s..." (file-name-nondirectory file))
     (condition-case nil
 	(progn
-	  (epg-import-keys-from-file context (expand-file-name file))
+	  (epg-import-keys-from-file context file)
 	  (message "Importing %s...done" (file-name-nondirectory file)))
       (error
        (message "Importing %s...failed" (file-name-nondirectory file))))