X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-menu.el;h=4368f16ad122cbd43f478cf0fedf85c5b4042ed2;hb=ea593c23f58306d08a8659e4746efc41443c7387;hp=f65860015fb689f1c4160a29d5b9b4bc41086d71;hpb=2e8d72b091af0ce1e3673f90d8024739328a0d7c;p=elisp%2Friece.git

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index f658600..4368f16 100644
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -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)