epg: Fix key generation interface

* epg.el (epg-start-generate-key): Fix typo in "gpg --gen-key"
invocation; make the PARAMETERS documentation clearer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25ac7ae67826ba6c1452c5a5bd04883cb54ec62d..e91d2bc046450dc48b4f240d4cca23efd91ba4ae 100644 (file)
--- 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 f66545306dacaa621f88ea19f7daf02e37ac3108..1b75b50df0ebba72786ad6e1059de2fc03037377 100644 (file)
--- 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)))