From: ueno <ueno>
Date: Sat, 29 Apr 2006 23:30:31 +0000 (+0000)
Subject: * epg.el (epg-make-user-id): Renamed name -> string.
X-Git-Tag: epg-0_0_2~77
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8df22ca72bbd42de3c77786a2d2e309a791ebe1b;p=elisp%2Fepg.git

* epg.el (epg-make-user-id): Renamed name -> string.
---

diff --git a/ChangeLog b/ChangeLog
index 32df26d..6903a17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 	(epg-process-sentinel): Abolished.
 	(epg-signature-to-string): Decode DN.
 	(epg-list-keys): Cache user-id in epg-user-id-alist.
+	(epg-make-user-id): Renamed name -> string.
 
 2006-04-29  Daiki Ueno  <ueno@unixuser.org>
 
diff --git a/epg.el b/epg.el
index fdeb3da..13a8535 100644
--- a/epg.el
+++ b/epg.el
@@ -538,9 +538,9 @@ This function is for internal use only."
     (signal 'wrong-type-argument (list 'epg-sub-key-p sub-key)))
   (aset (cdr sub-key) 8 fingerprint))
 
-(defun epg-make-user-id (validity name)
+(defun epg-make-user-id (validity string)
   "Return a user ID object."
-  (cons 'epg-user-id (vector validity name nil)))
+  (cons 'epg-user-id (vector validity string nil)))
 
 (defun epg-user-id-validity (user-id)
   "Return the validity of USER-ID."
@@ -548,7 +548,7 @@ This function is for internal use only."
     (signal 'wrong-type-argument (list 'epg-user-id-p user-id)))
   (aref (cdr user-id) 0))
 
-(defun epg-user-id-name (user-id)
+(defun epg-user-id-string (user-id)
   "Return the name of USER-ID."
   (unless (eq (car user-id) 'epg-user-id)
     (signal 'wrong-type-argument (list 'epg-user-id-p user-id)))
@@ -1127,7 +1127,7 @@ If MODE is t or 'secret, only secret keyring should be searched.
 Otherwise, only public keyring should be searched and the key
 signatures should be included."
   (let ((lines (epg-list-keys-1 context name mode))
-	keys cert key-id user-id-name entry)
+	keys cert key-id user-id-string entry)
     (while lines
       (cond
        ((member (aref (car lines) 0) '("pub" "sec" "crt" "crs"))
@@ -1140,12 +1140,12 @@ signatures should be included."
 	   (nreverse (epg-key-user-id-list (car keys))))
 	  (setq key-id
 		(epg-sub-key-id (car (epg-key-sub-key-list (car keys))))
-		user-id-name
-		(epg-user-id-name (car (epg-key-user-id-list (car keys))))
+		user-id-string
+		(epg-user-id-string (car (epg-key-user-id-list (car keys))))
 		entry (assoc key-id epg-user-id-alist))
 	  (if entry
-	      (setcdr entry user-id-name)
-	    (setq epg-user-id-alist (cons (cons key-id user-id-name)
+	      (setcdr entry user-id-string)
+	    (setq epg-user-id-alist (cons (cons key-id user-id-string)
 					  epg-user-id-alist))))
 	(setq cert (member (aref (car lines) 0) '("crt" "crs"))
 	      keys (cons (epg-make-key