[Emacs-diffs] /srv/bzr/emacs/trunk r112552: * epa.el (epa-decrypt-file): Take output file name as argument

[Richard Stallman]

------------------------------------------------------------
revno: 112552
committer: Richard Stallman <address@hidden>
branch nick: trunk
timestamp: Sat 2013-05-11 09:14:07 -0400
message:
  * epa.el (epa-decrypt-file): Take output file name as argument
  and read it using `interactive'.
modified:
  lisp/ChangeLog
  lisp/epa.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-11 07:39:59 +0000
+++ b/lisp/ChangeLog    2013-05-11 13:14:07 +0000
@@ -1,3 +1,8 @@
+2013-05-11  Richard Stallman  <address@hidden>
+
+       * epa.el (epa-decrypt-file): Take output file name as argument
+       and read it using `interactive'.
+
 2013-05-11  Leo Liu  <address@hidden>
 
        * progmodes/octave.el (octave-beginning-of-line)

=== modified file 'lisp/epa.el'
--- a/lisp/epa.el       2013-02-12 04:46:18 +0000
+++ b/lisp/epa.el       2013-05-11 13:14:07 +0000
@@ -621,30 +621,33 @@
       (message "%s..." prompt))))
 
 ;;;###autoload
-(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
-                 (concat "To file (default "
-                         (file-name-nondirectory default-name)
-                         ") ")
-                 (file-name-directory default-name)
-                 default-name)))
-        (context (epg-make-context epa-protocol)))
+(defun epa-decrypt-file (decrypt-file plain-file)
+  "Decrypt DECRYPT-FILE into PLAIN-FILE."
+  (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)))
+     (list file plain)))
+  (setq decrypt-file (expand-file-name decrypt-file))
+  (let ((context (epg-make-context epa-protocol)))
     (epg-context-set-passphrase-callback context
                                         #'epa-passphrase-callback-function)
     (epg-context-set-progress-callback context
                                       (cons
                                        #'epa-progress-callback-function
                                        (format "Decrypting %s..."
-                                               (file-name-nondirectory file))))
-    (message "Decrypting %s..." (file-name-nondirectory file))
-    (epg-decrypt-file context file plain)
-    (message "Decrypting %s...wrote %s" (file-name-nondirectory file)
-            (file-name-nondirectory plain))
+                                               (file-name-nondirectory 
decrypt-file))))
+    (message "Decrypting %s..." (file-name-nondirectory decrypt-file))
+    (epg-decrypt-file context decrypt-file plain-file)
+    (message "Decrypting %s...wrote %s" (file-name-nondirectory decrypt-file)
+            (file-name-nondirectory plain-file))
     (if (epg-context-result-for context 'verify)
        (epa-display-info (epg-verify-result-to-string
                           (epg-context-result-for context 'verify))))))