X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-menu.el;h=4368f16ad122cbd43f478cf0fedf85c5b4042ed2;hb=115c0e37d819d092b8f178eb693fbf3fe583c2ac;hp=612b7b0f485ee85ba9bcb1aa4a054f16754c6240;hpb=312bb821869adf84c0e0cc3fdfc879dc5b46f0c3;p=elisp%2Friece.git

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index 612b7b0..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:
 
@@ -111,14 +111,18 @@
   (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
 	    '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)
-  ;;FIXME: couldn't uninstall completely.
-  )
+	       'riece-menu-command-mode-hook))
 
 (provide 'riece-menu)