--- a/lisp/ediff/ediff-hook.el	Mon Aug 13 09:05:11 2007 +0200
+++ b/lisp/ediff/ediff-hook.el	Mon Aug 13 09:05:42 2007 +0200
@@ -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
@@ -127,6 +142,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] '("--"))
@@ -164,6 +182,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
@@ -203,8 +224,11 @@
        ;; 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))
+	 '("List Ediff Sessions..." . ediff-show-registry))
        (define-key menu-bar-epatch-menu [separator-epatch] '("--"))
        (define-key menu-bar-epatch-menu [ediff-patch-buffer]
 	 '("To a Buffer..." . ediff-patch-buffer))
@@ -298,7 +322,7 @@
 
   ;; misc
   (autoload 'ediff-show-registry
-    "ediff-meta"
+    "ediff-mult"
     "Display the registry of active Ediff sessions."
     t)
   (autoload 'ediff-documentation
@@ -309,6 +333,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