Note that versions from CVS may not be reliable.

[riece] / lisp / riece-menu.el

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index 3e42c8e..d11641e 100644 (file)
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -38,6 +38,7 @@
 (defvar riece-menu-items
   `("Riece"
     ["Version" riece-version t]
+    ["Submit Bug Report" riece-submit-bug-report t]
     "----"
     ("Change Window Layout..." :filter riece-menu-create-layouts-menu)
     ["Toggle Freeze Channel Buffer"
@@ -61,12 +62,13 @@
     ["Kick User" riece-command-kick riece-current-channel]
     ["Invite User" riece-command-invite riece-current-channel]
     "----"
+    ["Next Channel" riece-command-next-channel riece-current-channels]
+    ["Previous Channel" riece-command-previous-channel riece-current-channels]
+    "----"
     ("Channels" :filter riece-menu-create-channels-menu)
     ("Servers" :filter riece-menu-create-servers-menu))
   "Menu used in command mode.")
 
-(defvar riece-menu-enabled nil)
-
 (defconst riece-menu-description
   "Setup command menus on menubar")
 
@@ -100,25 +102,15 @@
          riece-server-alist))
 
 (defvar riece-command-mode-map)
-
+(defvar riece-menu)
 (defun riece-menu-insinuate ()
   (add-hook 'riece-command-mode-hook
            (lambda ()
              (easy-menu-define riece-menu
                                riece-command-mode-map
                                "Riece Menu"
-                               riece-menu-items))))
-
-(defvar riece-menu)
-(defun riece-menu-enable ()
-  (with-current-buffer riece-command-buffer
-    (easy-menu-add riece-menu))
-  (setq riece-menu-enabled t))
-
-(defun riece-menu-disable ()
-  (with-current-buffer riece-command-buffer
-    (easy-menu-remove riece-menu))
-  (setq riece-menu-enabled nil))
+                               riece-menu-items)
+             (easy-menu-add riece-menu))))
 
 (provide 'riece-menu)