Don't add secret key-id's to encryption recipients.

[elisp/epg.git] / epg.el

diff --git a/epg.el b/epg.el
index a775f54..bcc09d0 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -288,8 +288,7 @@ This function is for internal use only."
   "Start `epg-gpg-program' in a subprocess with given ARGS."
   (let* ((args (append (list "--no-tty"
                             "--status-fd" "1"
-                            "--command-fd" "0"
-                            "--yes") ; overwrite
+                            "--command-fd" "0")
                       (if (epg-context-armor context) '("--armor"))
                       (if (epg-context-textmode context) '("--textmode"))
                       (if (epg-context-output-file context)
@@ -584,7 +583,7 @@ This function is for internal use only."
 
 (defun epg-configuration ()
   "Return a list of internal configuration parameters of `epg-gpg-program'."
-  (let (configuration type)
+  (let (config type)
     (with-temp-buffer
       (apply #'call-process epg-gpg-program nil (list t nil) nil
             '("--with-colons" "--list-config"))
@@ -604,10 +603,10 @@ This function is for internal use only."
 
 (defun epg-list-keys (name &optional secret)
   "List keys associated with STRING."
-  (let ((args (list "--with-colons" "--no-greeting" "--batch"
-                   "--fixed-list-mode"
-                   (if secret "--list-secret-keys" "--list-keys")
-                   name))
+  (let ((args (append (list "--with-colons" "--no-greeting" "--batch"
+                           "--fixed-list-mode"
+                           (if secret "--list-secret-keys" "--list-keys"))
+                     (if name (list name))))
        keys type symbol pointer)
     (with-temp-buffer
       (apply #'call-process epg-gpg-program nil (list t nil) nil args)