Add defgroups, and use defcustom.

[gnu-emacs] / lisp / ediff-hook.el

diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 4b20d083b1622d574104f4967b0dfbeafb038ad1..25c5afc1d8b2a522ce55e636ccddc111524e019f 100644 (file)
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -38,9 +38,24 @@
 (defvar epatch-menu)
 ;; end pacifier
 
+
 (defun ediff-xemacs-init-menus ()
   (if (featurep 'menubar)
       (progn
+       (add-menu-button
+        '("Tools")
+        ["Use separate frame for Ediff control buffer"
+         ediff-toggle-multiframe
+         :style toggle
+         :selected (eq ediff-window-setup-function 'ediff-setup-windows-multiframe)]
+        "00-Browser...")
+       (add-menu-button
+        '("Tools")
+        ["Use a toolbar with Ediff control buffer"
+         ediff-menu-toggle-use-toolbar
+         :style toggle
+         :selected (ediff-use-toolbar-p)]
+        "00-Browser...")
        (add-submenu
         '("Tools") ediff-menu "OO-Browser...")
        (add-submenu
@@ -128,6 +143,9 @@
        ;; define ediff-menu
        (define-key menu-bar-ediff-menu [ediff-doc]
         '("Ediff Manual..." . ediff-documentation))
+       (define-key menu-bar-ediff-menu [emultiframe]
+       '("Toggle separate control buffer frame..."
+         . ediff-toggle-multiframe))
        (define-key menu-bar-ediff-menu [eregistry]
        '("List Ediff Sessions..." . ediff-show-registry))
        (define-key menu-bar-ediff-menu [separator-ediff-manual] '("--"))
@@ -165,6 +183,9 @@
        ;; define merge menu
        (define-key menu-bar-ediff-merge-menu [ediff-doc2]
         '("Ediff Manual..." . ediff-documentation))
+       (define-key menu-bar-ediff-merge-menu [emultiframe2]
+       '("Toggle separate control buffer frame..."
+         . ediff-toggle-multiframe))
        (define-key menu-bar-ediff-merge-menu [eregistry2]
        '("List Ediff Sessions..." . ediff-show-registry))
        (define-key
@@ -204,6 +225,9 @@
        ;; define epatch menu
        (define-key menu-bar-epatch-menu [ediff-doc3]
         '("Ediff Manual..." . ediff-documentation))
+       (define-key menu-bar-epatch-menu [emultiframe3]
+       '("Toggle separate control buffer frame..."
+         . ediff-toggle-multiframe))
        (define-key menu-bar-epatch-menu [eregistry3]
        '("List Ediff Sessions..." . ediff-show-registry))
        (define-key menu-bar-epatch-menu [separator-epatch] '("--"))
@@ -299,7 +323,7 @@
 
   ;; misc
   (autoload 'ediff-show-registry
-    "ediff-meta"
+    "ediff-mult"
     "Display the registry of active Ediff sessions."
     t)
   (autoload 'ediff-documentation
@@ -310,6 +334,15 @@
     "ediff"
     "Show Ediff's version and last modification date."
     t)
+  (autoload 'ediff-toggle-multiframe
+    "ediff-util"
+    "Toggle the use of separate frame for Ediff control buffer."
+    t)
+  (if (string-match "XEmacs" emacs-version)
+      (autoload 'ediff-toggle-use-toolbar
+       "ediff-tbar"
+       "Toggle the use of Ediff toolbar."
+       t))
   ) ; if purify-flag