* riece-display.el (riece-join-channel): Parse non-nil elements in

riece-default-channel-binding.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbac16e..ffe5b95 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-25  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-display.el (riece-join-channel): Parse non-nil elements in
+       riece-default-channel-binding.
+

 2003-08-25  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-identity.el (riece-format-identity): Add 'riece-identity
 2003-08-25  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-identity.el (riece-format-identity): Add 'riece-identity

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index 9a2400e..810bc1a 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -191,8 +191,13 @@ Local to the buffers.")
 (defun riece-join-channel (identity)
   (unless (riece-identity-member identity riece-current-channels)
     (setq riece-current-channels
 (defun riece-join-channel (identity)
   (unless (riece-identity-member identity riece-current-channels)
     (setq riece-current-channels

-         (riece-identity-assign-binding identity riece-current-channels
-                                        riece-default-channel-binding))
+         (riece-identity-assign-binding
+          identity riece-current-channels
+          (mapcar
+           (lambda (channel)
+             (if channel
+                 (riece-parse-identity channel)))
+           riece-default-channel-binding)))

     (riece-channel-buffer-create identity)
     (with-current-buffer riece-channel-list-buffer
       (setq riece-redisplay-buffer t))))
     (riece-channel-buffer-create identity)
     (with-current-buffer riece-channel-list-buffer
       (setq riece-redisplay-buffer t))))