From: ueno <ueno>
Date: Tue, 19 Dec 2006 09:04:02 +0000 (+0000)
Subject: * epa.el (epa-list-keys): If prefix-arg is specified, use "OpenPGP" as
X-Git-Tag: epg-0_0_9~16
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a19166c87958dbd29f0867b2416647981ff875a;p=elisp%2Fepg.git

* epa.el (epa-list-keys): If prefix-arg is specified, use "OpenPGP" as
the default protocol.
---

diff --git a/ChangeLog b/ChangeLog
index 6ec0cba..270c7db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 	* epa.el (epa-sign-region): --armor & --textmode.
 	(epa-encrypt-region): Ditto.
+	(epa-list-keys): If prefix-arg is specified, use "OpenPGP" as the
+	default protocol.
 	(epa-import-keys-region): New command.
 	(epa-insert-keys): New command.
 	(epa--insert-keys): Renamed from epa-insert-keys.
diff --git a/epa.el b/epa.el
index b9c55d2..c9ed3c6 100644
--- a/epa.el
+++ b/epa.el
@@ -330,10 +330,10 @@ 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)
-	       (y-or-n-p "Secret keys? ")
-	       (intern (completing-read "Protocol? "
+	       (y-or-n-p "Secret keys?")
+	       (intern (completing-read "Protocol? (default OpenPGP) "
 					'(("OpenPGP") ("CMS"))
-					nil t))))
+					nil t nil nil "OpenPGP"))))
      (or epa-list-keys-arguments (list nil nil nil))))
   (unless (and epa-keys-buffer
 	       (buffer-live-p epa-keys-buffer))