X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-menu.el;h=1117c037f18d5fd22fd8c6654ba32feecbde6983;hp=5f191f467100d3c8271839885daba066a89b7c8c;hb=df0096c0db08e28894a01a0ddf44003da2ec23d5;hpb=ed6e8a898665d12bbbdf0d8e59ee7b692de17c09

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index 5f191f4..1117c03 100644
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -65,13 +65,9 @@
     ("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)
-
 (defun riece-menu-create-layouts-menu (menu)
   (mapcar (lambda (entry)
 	    (vector (car entry) (list 'riece-command-change-layout (car entry))
@@ -102,7 +98,7 @@
 	  riece-server-alist))
 
 (defvar riece-command-mode-map)
-
+(defvar riece-menu)
 (defun riece-menu-insinuate ()
   (add-hook 'riece-command-mode-hook
 	    (lambda ()
@@ -110,18 +106,7 @@
 				riece-command-mode-map
 				"Riece Menu"
 				riece-menu-items)
-	      (riece-enable-addon 'riece-menu))))
-
-(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))
+	      (easy-menu-add riece-menu))))
 
 (provide 'riece-menu)