Don't use epa-list-keys-arguments.

[epg/epg.git] / epa.el

diff --git a/epa.el b/epa.el
index bc9cf4f..45f1959 100644 (file)
--- a/epa.el
+++ b/epa.el
@@ -186,7 +186,6 @@ the separate window."
     (define-key keymap "r" 'epa-delete-keys)
     (define-key keymap "i" 'epa-import-keys)
     (define-key keymap "o" 'epa-export-keys)
-    (define-key keymap "g" 'epa-list-keys)
     (define-key keymap "n" 'next-line)
     (define-key keymap "p" 'previous-line)
     (define-key keymap " " 'scroll-up)
@@ -376,7 +375,7 @@ If ARG is non-nil, mark the current line."
     (widget-setup)
     (set-keymap-parent (current-local-map) widget-keymap))
   (make-local-variable 'epa-list-keys-arguments)
-  (setq epa-list-keys-arguments (list name mode))
+  (setq epa-list-keys-arguments (list name secret))
   (goto-char (point-min))
   (pop-to-buffer (current-buffer)))
 
@@ -389,7 +388,7 @@ If ARG is non-nil, mark the current line."
                                (if epa-list-keys-arguments
                                    (car epa-list-keys-arguments)))))
         (list (if (equal name "") nil name)))
-     (or epa-list-keys-arguments (list nil nil))))
+     (list nil)))
   (epa--list-keys name nil))
 
 ;;;###autoload
@@ -401,7 +400,7 @@ If ARG is non-nil, mark the current line."
                                (if epa-list-keys-arguments
                                    (car epa-list-keys-arguments)))))
         (list (if (equal name "") nil name)))
-     (or epa-list-keys-arguments (list nil nil))))
+     (list nil)))
   (epa--list-keys name t))
 
 (defun epa--marked-keys ()
@@ -454,19 +453,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
                      "Click here or \\[exit-recursive-edit] to finish")
                     "OK")
       (insert "\n\n")
-      (if names
-         (while names
-           (epa--insert-keys context (car names) secret)
-           (if (get-text-property (point) 'epa-list-keys)
-               (epa-mark))
-           (goto-char (point-max))
-           (setq names (cdr names)))
-       (if secret
-           (progn
-             (epa--insert-keys context nil secret)
-             (if (get-text-property (point) 'epa-list-keys)
-                 (epa-mark)))
-         (epa--insert-keys context nil nil)))
+      (epa--insert-keys context names secret)
       (widget-setup)
       (set-keymap-parent (current-local-map) widget-keymap)
       (setq epa-exit-buffer-function #'abort-recursive-edit)