From fc3ba4e14774ea0e350490aeebc9625f4a552c7d Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Wed, 11 Jun 2003 08:58:38 +0000
Subject: [PATCH] * riece-identity.el (riece-identity-member): Assume that
 each element of list is identity object.
 (riece-identity-member-no-server): Ditto.

* riece-handle.el (riece-handle-nick-message): Follow the change
of riece-identity-member.

* riece-commands.el (riece-command-next-channel): Use
riece-identity-member instead of riece-identity-member-no-server.
(riece-command-previous-channel): Ditto.
---
 lisp/ChangeLog         |   13 +++++++++++++
 lisp/riece-commands.el |    4 ++--
 lisp/riece-handle.el   |    6 +++++-
 lisp/riece-identity.el |    6 ++----
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3be7d79..9669b9a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,18 @@
 2003-06-11  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-identity.el (riece-identity-member): Assume that each
+	element of list is identity object.
+	(riece-identity-member-no-server): Ditto.
+
+	* riece-handle.el (riece-handle-nick-message): Follow the change
+	of riece-identity-member.
+
+	* riece-commands.el (riece-command-next-channel): Use
+	riece-identity-member instead of riece-identity-member-no-server.
+	(riece-command-previous-channel): Ditto.
+
+2003-06-11  Daiki Ueno  <ueno@unixuser.org>
+
 	* riece-identity.el (riece-completing-read-identity): Remove nil
 	from channels before completing-read.
 
diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index c3364d0..52e6582 100644
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -69,7 +69,7 @@
   "Select the next channel."
   (interactive)
   (when (> (length riece-current-channels) 1)
-    (let ((pointer (cdr (riece-identity-member-no-server
+    (let ((pointer (cdr (riece-identity-member
 			 riece-current-channel
 			 riece-current-channels))))
       (while (and pointer
@@ -88,7 +88,7 @@
   "Select the previous channel."
   (interactive)
   (when (> (length riece-current-channels) 1)
-    (let ((pointer (riece-identity-member-no-server
+    (let ((pointer (riece-identity-member
 		    riece-current-channel
 		    riece-current-channels))
 	  (start riece-current-channels)
diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index 5dbd1d7..55ba18b 100644
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -34,7 +34,11 @@
   (let* ((old (riece-prefix-nickname prefix))
 	 (new (car (riece-split-parameters string)))
 	 (channels (riece-user-get-channels old))
-	 (visible (riece-identity-member riece-current-channel channels)))
+	 (visible (riece-identity-member
+		   riece-current-channel
+		   (mapcar (lambda (channel)
+			     (riece-make-identity channel riece-server-name))
+			   channels))))
     (riece-naming-assert-rename old new)
     (let ((pointer (riece-identity-member
 		    (riece-make-identity old riece-server-name)
diff --git a/lisp/riece-identity.el b/lisp/riece-identity.el
index 3f7e2a1..42690ba 100644
--- a/lisp/riece-identity.el
+++ b/lisp/riece-identity.el
@@ -83,8 +83,7 @@ RFC2812, 2.2 \"Character codes\" says:
   "Return non-nil if an identity ELT is an element of LIST."
   (catch 'found
     (while list
-      (if (and (vectorp (car list))
-	       (riece-identity-equal (car list) elt))
+      (if (riece-identity-equal (car list) elt)
 	  (throw 'found list)
 	(setq list (cdr list))))))
 
@@ -94,8 +93,7 @@ The only difference with `riece-identity-member', this function doesn't
 take server names into account."
   (catch 'found
     (while list
-      (if (and (vectorp (car list))
-	       (riece-identity-equal-no-server (car list) elt))
+      (if (riece-identity-equal-no-server (car list) elt)
 	  (throw 'found list)
 	(setq list (cdr list))))))
 
-- 
1.7.10.4