diff options
| author | Glenn Morris | 2013-06-09 17:32:49 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-06-09 17:32:49 -0700 |
| commit | ff4871b986a082a4b21867827e460c50bfa0cb09 (patch) | |
| tree | 47a68819706e8e7bf2da9e9a861b1ca20887b914 /doc/misc | |
| parent | ad257d4f6c67ff216a1944acde6e9cf740922ae8 (diff) | |
| download | emacs-ff4871b986a082a4b21867827e460c50bfa0cb09.tar.gz emacs-ff4871b986a082a4b21867827e460c50bfa0cb09.zip | |
* 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.
Fixes: debbugs:14510
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/epa.texi | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index bcd3fe78ae8..ce2852e90f8 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-06-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * epa.texi (Cryptographic operations on files): Update epa-decrypt-file. | ||
| 4 | |||
| 1 | 2013-06-04 Katsumi Yamaoka <yamaoka@jpl.org> | 5 | 2013-06-04 Katsumi Yamaoka <yamaoka@jpl.org> |
| 2 | 6 | ||
| 3 | * gnus.texi (Article Date): | 7 | * gnus.texi (Article Date): |
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index e21851ef37a..adc63cc0bdb 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi | |||
| @@ -240,8 +240,9 @@ you answered yes, it will let you select the signing keys. | |||
| 240 | @node Cryptographic operations on files | 240 | @node Cryptographic operations on files |
| 241 | @section Cryptographic operations on files | 241 | @section Cryptographic operations on files |
| 242 | 242 | ||
| 243 | @deffn Command epa-decrypt-file file | 243 | @deffn Command epa-decrypt-file file &optional output |
| 244 | Decrypt @var{file}. | 244 | Decrypt @var{file}. If you do not specify the name @var{output} to |
| 245 | use for the decrypted file, this function prompts for the value to use. | ||
| 245 | @end deffn | 246 | @end deffn |
| 246 | 247 | ||
| 247 | @deffn Command epa-verify-file file | 248 | @deffn Command epa-verify-file file |