From: ueno <ueno>
Date: Tue, 7 Oct 2003 23:43:59 +0000 (+0000)
Subject: * riece-display.el (riece-channel-buffer-name): Check whether
X-Git-Tag: riece-0_1_3~17
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f397cbaa536d204e7ddd7531fae3b990a60f7bed;p=elisp%2Friece.git

* riece-display.el (riece-channel-buffer-name): Check whether
IDENTITY is a member of riece-current-channels.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 53dbc71..7fabcd4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-07  Daiki Ueno  <ueno@unixuser.org>
+
+	* riece-display.el (riece-channel-buffer-name): Check whether
+	IDENTITY is a member of riece-current-channels.
+
 2003-10-07  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* riece-commands.el (riece-command-kick): Fix completing-read
diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index 6dcec6a..62d2125 100644
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -161,7 +161,12 @@
   (force-mode-line-update t))
 
 (defun riece-channel-buffer-name (identity)
-  (format riece-channel-buffer-format (riece-format-identity identity)))
+  (let ((channels (riece-identity-member identity riece-current-channels)))
+    (if channels
+	(setq identity (car channels))
+      (if riece-debug
+	  (message "%S is not a member of riece-current-channels" identity)))
+    (format riece-channel-buffer-format (riece-format-identity identity))))
 
 (eval-when-compile
   (autoload 'riece-channel-mode "riece"))