[Emacs-diffs] master 71fdbd7: epg: Fix key generation interface

[Daiki Ueno]

branch: master
commit 71fdbd770bf06ad48bcb165e85b59778abc9ed06
Author: Daiki Ueno <address@hidden>
Commit: Daiki Ueno <address@hidden>

    epg: Fix key generation interface
    
    * epg.el (epg-start-generate-key): Fix typo in "gpg --gen-key"
    invocation; make the PARAMETERS documentation clearer.
---
 lisp/ChangeLog |    5 +++++
 lisp/epg.el    |    8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25ac7ae..e91d2bc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-24  Daiki Ueno  <address@hidden>
+
+       * epg.el (epg-start-generate-key): Fix typo in "gpg --gen-key"
+       invocation; make the PARAMETERS documentation clearer.
+
 2015-03-24  Stefan Monnier  <address@hidden>
 
        Add cl-struct specific optimizations to pcase.
diff --git a/lisp/epg.el b/lisp/epg.el
index f665453..1b75b50 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)))