(winner-mode): Autoload cookie for defcustom too.

[bpt/emacs.git] / lisp / ediff-hook.el

diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 4106ef1..0d412d4 100644 (file)
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -126,10 +126,11 @@
           ))
 
        ;; put these menus before Object-Oriented-Browser in Tools menu
-       (add-hook 'before-init-hook 'ediff-xemacs-init-menus)
-       (if (not purify-flag)
-          (ediff-xemacs-init-menus))
-       )
+;;       (add-hook 'before-init-hook 'ediff-xemacs-init-menus)
+;;       (if (not purify-flag)
+;;        (ediff-xemacs-init-menus))
+;;       )
+       (ediff-xemacs-init-menus))
       
       ;; Emacs--only if menu-bar is loaded
       ((featurep 'menu-bar)
@@ -243,6 +244,7 @@
   (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t)
   (autoload 'ebuffers3 "ediff" "Compare three bufers" t)
 
+  (autoload 'erevision "ediff" "Compare versions of a file" t)
   (autoload 'ediff-revision "ediff" "Compare versions of a file" t)
 
   ;; compare regions and windows
@@ -317,6 +319,10 @@
     "ediff-mult"
     "Display the registry of active Ediff sessions."
     t)
+  (autoload 'eregistry
+    "ediff-mult"
+    "Display the registry of active Ediff sessions."
+    t)
   (autoload 'ediff-documentation
     "ediff"
     "Display Ediff's manual."