X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-menu.el;h=4023b7d3a0e253fc0bb00207ce1aef2dfaf6c889;hp=2c349e98eca7586afda01e36be35186fb6758a4a;hb=b9ad16fc8024cd63bf7f9933aceb0cc1c2c88db4;hpb=e181f1a7f1ea36733e4604ffb97814d50c4e2295

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index 2c349e9..4023b7d 100644
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -1,4 +1,4 @@
-;;; riece-menu.el --- define command menu on menubar
+;;; riece-menu.el --- setup Riece's command menus
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -24,8 +24,7 @@
 
 ;;; Commentary:
 
-;; To use, add the following line to your ~/.riece/init.el:
-;; (add-to-list 'riece-addons 'riece-menu)
+;; NOTE: This is an add-on module for Riece.
 
 ;;; Code:
 
@@ -38,6 +37,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,16 +61,15 @@
     ["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")
-
-(put 'riece-menu 'riece-addon-default-disabled t)
+  "Setup Riece's command menus.")
 
 (defun riece-menu-create-layouts-menu (menu)
   (mapcar (lambda (entry)
@@ -102,25 +101,28 @@
 	  riece-server-alist))
 
 (defvar riece-command-mode-map)
+(defvar riece-menu)
+
+(defun riece-menu-command-mode-hook ()
+  (easy-menu-define riece-menu
+		    riece-command-mode-map
+		    "Riece Menu"
+		    riece-menu-items)
+  (easy-menu-add riece-menu))
 
 (defun riece-menu-insinuate ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+	(riece-menu-command-mode-hook)))
   (add-hook 'riece-command-mode-hook
-	    (lambda ()
-	      (easy-menu-define riece-menu
-				riece-command-mode-map
-				"Riece Menu"
-				riece-menu-items)
-	      (riece-enable-addon '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-command-mode-hook))
+
+(defun riece-menu-uninstall ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+	(easy-menu-remove riece-menu)))
+  (remove-hook 'riece-command-mode-hook
+	       'riece-menu-command-mode-hook))
 
 (provide 'riece-menu)