* lisp/epa.el (epa-read-file-name): New function.

[gnu-emacs] / lisp / epa.el

diff --git a/lisp/epa.el b/lisp/epa.el
index b567df5f40b65e7c605864aa94fa5984b8a9bf10..14f8879c1c65caacf8d4b176bd9fc11697a9ac8c 100644 (file)
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -620,21 +620,24 @@ If SECRET is non-nil, list secret keys instead of public keys."
                   (floor (* (/ current (float total)) 100))))
       (message "%s..." prompt))))
 
+(defun epa-read-file-name (input)
+  "Interactively read an output file name based on INPUT file name."
+  (setq input (file-name-sans-extension (expand-file-name input)))
+  (expand-file-name
+   (read-file-name
+    (concat "To file (default " (file-name-nondirectory input) ") ")
+    (file-name-directory input)
+    input)))
+
 ;;;###autoload
-(defun epa-decrypt-file (decrypt-file plain-file)
-  "Decrypt DECRYPT-FILE into PLAIN-FILE."
+(defun epa-decrypt-file (decrypt-file &optional plain-file)
+  "Decrypt DECRYPT-FILE into PLAIN-FILE.
+If you do not specify PLAIN-FILE, this functions prompts for the value to use."
   (interactive
-   (let (file default-name plain)
-     (setq file (read-file-name "File to decrypt: "))
-     (setq default-name (file-name-sans-extension (expand-file-name file)))
-     (setq plain (expand-file-name
-                 (read-file-name
-                  (concat "To file (default "
-                          (file-name-nondirectory default-name)
-                          ") ")
-                  (file-name-directory default-name)
-                  default-name)))
+   (let* ((file (read-file-name "File to decrypt: "))
+         (plain (epa-read-file-name file)))
      (list file plain)))
+  (or plain-file (setq plain-file (epa-read-file-name decrypt-file)))
   (setq decrypt-file (expand-file-name decrypt-file))
   (let ((context (epg-make-context epa-protocol)))
     (epg-context-set-passphrase-callback context