Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
212e29f2
Commit
212e29f2
authored
May 11, 2013
by
Richard M. Stallman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* epa.el (epa-decrypt-file): Take output file name as argument
and read it using `interactive'.
parent
6980b0ca
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
18 deletions
+26
-18
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/epa.el
lisp/epa.el
+21
-18
No files found.
lisp/ChangeLog
View file @
212e29f2
2013-05-11 Richard Stallman <rms@gnu.org>
* epa.el (epa-decrypt-file): Take output file name as argument
and read it using `interactive'.
2013-05-11 Leo Liu <sdl.web@gmail.com>
* progmodes/octave.el (octave-beginning-of-line)
...
...
lisp/epa.el
View file @
212e29f2
...
...
@@ -621,30 +621,33 @@ If SECRET is non-nil, list secret keys instead of public keys."
(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
(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)))
(context (epg-make-context epa-protocol)))
(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))))))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment