From: ueno <ueno>
Date: Mon, 26 Mar 2007 08:24:50 +0000 (+0000)
Subject: (epa--insert-keys): Changed arglist.  All callers changed.
X-Git-Tag: epg-0_0_11~14
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e02f1ae72c8295b6da2531a44789e9b01d27edb0;p=elisp%2Fepg.git

(epa--insert-keys): Changed arglist.  All callers changed.
---

diff --git a/ChangeLog b/ChangeLog
index 6e4c09e..07dfb23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-26  Daiki Ueno  <ueno@unixuser.org>
+
+	* epa.el (epa--insert-keys): Changed arglist.  All callers changed.
+
 2007-03-25  Daiki Ueno  <ueno@unixuser.org>
 
 	* epa.el (epa-protocol): defcustom -> defvar.
diff --git a/epa.el b/epa.el
index f3a67a6..98c75be 100644
--- a/epa.el
+++ b/epa.el
@@ -332,12 +332,11 @@ If ARG is non-nil, mark the current line."
   (interactive)
   (funcall epa-exit-buffer-function))
 
-(defun epa--insert-keys (context name mode)
+(defun epa--insert-keys (keys)
   (save-excursion
     (save-restriction
       (narrow-to-region (point) (point))
-      (let ((keys (epg-list-keys context name mode))
-	    point)
+      (let (point)
 	(while keys
 	  (setq point (point))
 	  (insert "  ")
@@ -374,7 +373,7 @@ If ARG is non-nil, mark the current line."
 		     (or (next-single-property-change point 'epa-list-keys)
 			 (point-max)))
       (goto-char point))
-    (epa--insert-keys context name secret)
+    (epa--insert-keys (epg-list-keys context name secret))
     (widget-setup)
     (set-keymap-parent (current-local-map) widget-keymap))
   (make-local-variable 'epa-list-keys-arguments)
@@ -459,7 +458,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")
-      (epa--insert-keys context names secret)
+      (epa--insert-keys (epg-list-keys context name mode))
       (widget-setup)
       (set-keymap-parent (current-local-map) widget-keymap)
       (setq epa-exit-buffer-function #'abort-recursive-edit)