Undo the last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bdd8220..24f5466 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,10 +6,6 @@
 
 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.
 

diff --git a/lisp/riece-identity.el b/lisp/riece-identity.el
index 42690ba..c2c3b75 100644 (file)
--- a/lisp/riece-identity.el
+++ b/lisp/riece-identity.el
@@ -83,7 +83,10 @@ RFC2812, 2.2 \"Character codes\" says:
   "Return non-nil if an identity ELT is an element of LIST."
   (catch 'found
     (while list
-      (if (riece-identity-equal (car list) elt)
+      (if (and (vectorp (car list))    ;needed because
+                                       ;riece-current-channels
+                                       ;contains nil.
+              (riece-identity-equal (car list) elt))
          (throw 'found list)
        (setq list (cdr list))))))
 
@@ -93,7 +96,10 @@ The only difference with `riece-identity-member', this function doesn't
 take server names into account."
   (catch 'found
     (while list
-      (if (riece-identity-equal-no-server (car list) elt)
+      (if (and (vectorp (car list))    ;needed because
+                                       ;riece-current-channels
+                                       ;contains nil.
+              (riece-identity-equal-no-server (car list) elt))
          (throw 'found list)
        (setq list (cdr list))))))