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

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index d11641e..4368f16 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>
@@ -19,13 +19,12 @@
 
 ;; 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:
 
-;; 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:
 
@@ -70,7 +69,7 @@
   "Menu used in command mode.")
 
 (defconst riece-menu-description
-  "Setup command menus on menubar")
+  "Setup Riece's command menus.")
 
 (defun riece-menu-create-layouts-menu (menu)
   (mapcar (lambda (entry)
@@ -103,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)