From: ueno <ueno>
Date: Wed, 20 Dec 2006 03:51:03 +0000 (+0000)
Subject: * epa.el (epa-list-keys): Abolished PROTOCOL arg.
X-Git-Tag: epg-0_0_9~12
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a121f91eb9bab56374be1015d8c76c98b1df3887;p=elisp%2Fepg.git

* epa.el (epa-list-keys): Abolished PROTOCOL arg.
---

diff --git a/ChangeLog b/ChangeLog
index d464b63..8a22aa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-20  Daiki Ueno  <ueno@unixuser.org>
+
+	* epa.el (epa-list-keys): Abolished PROTOCOL arg.
+
 2006-12-19  Daiki Ueno  <ueno@unixuser.org>
 
 	* epg.el (epg-export-keys-to-file): Fixed a typo.
diff --git a/epa.el b/epa.el
index 90b7ddf..44d8431 100644
--- a/epa.el
+++ b/epa.el
@@ -329,19 +329,15 @@ If ARG is non-nil, mark the current line."
   (funcall epa-exit-buffer-function))
 
 ;;;###autoload
-(defun epa-list-keys (&optional name mode protocol)
+(defun epa-list-keys (&optional name mode)
   (interactive
    (if current-prefix-arg
        (let ((name (read-string "Pattern: "
 				(if epa-list-keys-arguments
 				    (car epa-list-keys-arguments)))))
 	 (list (if (equal name "") nil name)
-	       (y-or-n-p "Secret keys? ")
-	       (intern (completing-read
-			(format "Protocol? (default %S) " epa-protocol)
-			'(("OpenPGP") ("CMS"))
-			nil t nil nil (symbol-name epa-protocol)))))
-     (or epa-list-keys-arguments (list nil nil epa-protocol))))
+	       (y-or-n-p "Secret keys? ")))
+     (or epa-list-keys-arguments (list nil nil))))
   (unless (and epa-keys-buffer
 	       (buffer-live-p epa-keys-buffer))
     (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
@@ -349,7 +345,7 @@ If ARG is non-nil, mark the current line."
   (let ((inhibit-read-only t)
 	buffer-read-only
 	(point (point-min))
-	(context (epg-make-context protocol)))
+	(context (epg-make-context epa-protocol)))
     (unless (get-text-property point 'epa-list-keys)
       (setq point (next-single-property-change point 'epa-list-keys)))
     (when point
@@ -362,7 +358,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 protocol))
+  (setq epa-list-keys-arguments (list name mode))
   (goto-char (point-min))
   (pop-to-buffer (current-buffer)))