diff options
| author | Daiki Ueno <ueno@gnu.org> | 2015-03-24 16:32:08 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2015-03-24 16:32:08 +0900 |
| commit | 71fdbd770bf06ad48bcb165e85b59778abc9ed06 (patch) | |
| tree | 20607113d591b3b81bae6dca5da336126aa9f4f0 | |
| parent | e5ce95fa4a0b311792b9b9dcc3b8901fc1f24a0d (diff) | |
| download | emacs-71fdbd770bf06ad48bcb165e85b59778abc9ed06.tar.gz | |
epg: Fix key generation interface
* epg.el (epg-start-generate-key): Fix typo in "gpg --gen-key"
invocation; make the PARAMETERS documentation clearer.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/epg.el | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 25ac7ae6782..e91d2bc0464 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-03-24 Daiki Ueno <ueno@gnu.org> + + * epg.el (epg-start-generate-key): Fix typo in "gpg --gen-key" + invocation; make the PARAMETERS documentation clearer. + 2015-03-24 Stefan Monnier <monnier@iro.umontreal.ca> Add cl-struct specific optimizations to pcase. diff --git a/lisp/epg.el b/lisp/epg.el index f66545306da..1b75b50df0e 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -2051,7 +2051,9 @@ If you are unsure, use synchronous version of this function (defun epg-start-generate-key (context parameters) "Initiate a key generation. -PARAMETERS specifies parameters for the key. +PARAMETERS is a string which specifies parameters of the generated key. +See Info node `(gnupg) Unattended GPG key generation' in the +GnuPG manual for the format. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call @@ -2061,9 +2063,9 @@ If you are unsure, use synchronous version of this function (setf (epg-context-operation context) 'generate-key) (setf (epg-context-result context) nil) (if (epg-data-file parameters) - (epg--start context (list "--batch" "--genkey" "--" + (epg--start context (list "--batch" "--gen-key" "--" (epg-data-file parameters))) - (epg--start context '("--batch" "--genkey")) + (epg--start context '("--batch" "--gen-key")) (if (eq (process-status (epg-context-process context)) 'run) (process-send-string (epg-context-process context) (epg-data-string parameters))) |