Fixed.

[riece] / lisp / riece-menu.el

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index f658600..4023b7d 100644 (file)
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -102,14 +102,27 @@
 
 (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)
-             (easy-menu-add riece-menu))))
+           '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)