Use lexical binding.

[riece] / lisp / riece-menu.el

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index a1524f3..2b5e699 100644 (file)
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -1,4 +1,4 @@
-;;; riece-menu.el --- setup menus
+;;; riece-menu.el --- setup menus -*- lexical-binding: t -*-
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -87,25 +87,29 @@
 (defconst riece-menu-description
   "Setup Riece's command menus.")
 
-(defun riece-menu-create-layouts-menu (menu)
+(defun riece-menu-create-layouts-menu (_menu)
   (mapcar (lambda (entry)
            (vector (car entry) (list 'riece-command-change-layout (car entry))
                    t))
          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))
-
-(defun riece-menu-create-servers-menu (menu)
+(defun riece-menu-create-channels-menu (_menu)
+  (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)
            (list (car entry)
                  (vector (riece-mcat "Open Server")