Fixed.

[elisp/epg.git] / epa.el

diff --git a/epa.el b/epa.el
index 100e02d..49ddd4a 100644 (file)
--- 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)
@@ -393,11 +394,11 @@
 (defun epa-sign-file (file detached)
   (interactive
    (list (expand-file-name (read-file-name "File: "))
-        current-prefix-arg))
+        (y-or-n-p "Make a detached signature? ")))
   (let ((signature (concat file (if detached ".sig" ".gpg")))
        (context (epg-make-context)))
     (message "Signing %s..." (file-name-nondirectory file))
-    (epg-sign-file context file signature)
+    (epg-sign-file context file signature (not (null detached)))
     (message "Signing %s...done" (file-name-nondirectory file))))
 
 (defun epa-encrypt-file (file recipients)