From: ueno <ueno>
Date: Tue, 27 May 2008 09:26:24 +0000 (+0000)
Subject: (riece-menu-create-channels-menu): Remove
X-Git-Tag: riece-5_0_0~10
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d45922785b8081b4901b02cad17b2396c167340b;p=elisp%2Friece.git

(riece-menu-create-channels-menu): Remove
placeholder channels.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 132e0d3..4bb8a31 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2008-05-27  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-menu.el (riece-menu-create-channels-menu): Remove
+	placeholder channels.
+
+2008-05-27  Daiki Ueno  <ueno@unixuser.org>
+
 	* riece-addon-modules.el (riece-addon-modules): Translate add-on
 	description.
 
diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index a1524f3..6e6a6c7 100644
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -94,16 +94,20 @@
 	  riece-layout-alist))
 
 (defun riece-menu-create-channels-menu (menu)
-  (mapcar (lambda (channel)
-	    (list (riece-format-identity channel)
-		  (vector (riece-mcat "Switch To Channel")
-			  (list 'riece-command-switch-to-channel channel) t)
-		  (vector (riece-mcat "Part Channel")
-			  (list 'riece-command-part channel) t)
-		  (vector (riece-mcat "List Channel")
-			  (list 'riece-command-list
-				(riece-identity-prefix channel)) t)))
-	  riece-current-channels))
+  (delq nil
+	(mapcar (lambda (channel)
+		  (if channel
+		      (list (riece-format-identity channel)
+			    (vector (riece-mcat "Switch To Channel")
+				    (list 'riece-command-switch-to-channel
+					  channel)
+				    t)
+			    (vector (riece-mcat "Part Channel")
+				    (list 'riece-command-part channel) t)
+			    (vector (riece-mcat "List Channel")
+				    (list 'riece-command-list
+					  (riece-identity-prefix channel)) t))))
+		riece-current-channels)))
 
 (defun riece-menu-create-servers-menu (menu)
   (mapcar (lambda (entry)