* riece-layout.el (riece-set-window-points): Restore window-point

[riece] / lisp / riece-menu.el

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index 5df0fbc..3e42c8e 100644 (file)
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -29,6 +29,12 @@
 
 ;;; Code:
 
+(require 'riece-options)
+(require 'riece-globals)
+(require 'riece-identity)
+(require 'riece-layout)
+(require 'riece-server)
+
 (defvar riece-menu-items
   `("Riece"
     ["Version" riece-version t]
@@ -59,6 +65,11 @@
     ("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")
+
 (defun riece-menu-create-layouts-menu (menu)
   (mapcar (lambda (entry)
            (vector (car entry) (list 'riece-command-change-layout (car entry))
@@ -88,14 +99,26 @@
                          (riece-server-opened (car entry)))))
          riece-server-alist))
 
+(defvar riece-command-mode-map)
+
 (defun riece-menu-insinuate ()
   (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-items))))
+
+(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))
 
 (provide 'riece-menu)