[Emacs-diffs] trunk r112903: * lisp/epa.el (epa-read-file-name): New function.

[Glenn Morris]

------------------------------------------------------------
revno: 112903
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14510
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-06-09 17:32:49 -0700
message:
  * lisp/epa.el (epa-read-file-name): New function. 
  (epa-decrypt-file): Make plain-file optional.  Use epa-read-file-name.
  
  * doc/misc/epa.texi (Cryptographic operations on files): Update 
epa-decrypt-file.

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-06-04 08:43:07 +0000
+++ b/doc/misc/ChangeLog        2013-06-10 00:32:49 +0000
@@ -1,3 +1,7 @@
+2013-06-10  Glenn Morris  <address@hidden>
+
+       * epa.texi (Cryptographic operations on files): Update epa-decrypt-file.
+
 2013-06-04  Katsumi Yamaoka  <address@hidden>
 
        * gnus.texi (Article Date):

=== modified file 'doc/misc/epa.texi'
--- a/doc/misc/epa.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/epa.texi 2013-06-10 00:32:49 +0000
@@ -240,8 +240,9 @@
 @node Cryptographic operations on files
 @section Cryptographic operations on files
 
address@hidden Command epa-decrypt-file file
-Decrypt @var{file}.
address@hidden Command epa-decrypt-file file &optional output
+Decrypt @var{file}.  If you do not specify the name @var{output} to
+use for the decrypted file, this function prompts for the value to use.
 @end deffn
 
 @deffn Command epa-verify-file file

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-09 06:44:47 +0000
+++ b/lisp/ChangeLog    2013-06-10 00:32:49 +0000
@@ -1,3 +1,8 @@
+2013-06-10  Glenn Morris  <address@hidden>
+
+       * epa.el (epa-read-file-name): New function.  (Bug#14510)
+       (epa-decrypt-file): Make plain-file optional.  Use epa-read-file-name.
+
 2013-06-09  Aidan Gauland  <address@hidden>
 
        * eshell/em-term.el (eshell-visual-command-p): Fix bug that caused

=== modified file 'lisp/epa.el'
--- a/lisp/epa.el       2013-05-11 13:14:07 +0000
+++ b/lisp/epa.el       2013-06-10 00:32:49 +0000
@@ -620,21 +620,24 @@
                   (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