From: ueno <ueno>
Date: Sat, 24 Mar 2007 09:02:33 +0000 (+0000)
Subject: * epa.el (epa-select-keys): Simplified; don't select the first
X-Git-Tag: epg-0_0_11~25
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=b82f5afe5145e01b7bd40868a622d8dc655edd41;p=elisp%2Fepg.git

* epa.el (epa-select-keys): Simplified; don't select the first
matching key.
---

diff --git a/ChangeLog b/ChangeLog
index f0a6c93..a11bcfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-03-24  Daiki Ueno  <ueno@unixuser.org>
 
+	* epa.el (epa-select-keys): Simplified; don't select the first
+	matching key.
+
 	* epg.el (epg--list-keys-1): Accept a list of strings as NAME
 	argument.
 	(epg-list-keys): Ditto.
diff --git a/epa.el b/epa.el
index 0967286..fe46903 100644
--- a/epa.el
+++ b/epa.el
@@ -454,19 +454,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)