[Emacs-diffs] Changes to emacs/lisp/ediff-hook.el

[Michael Kifer]

Index: emacs/lisp/ediff-hook.el
diff -c emacs/lisp/ediff-hook.el:1.21 emacs/lisp/ediff-hook.el:1.22
*** emacs/lisp/ediff-hook.el:1.21       Tue Apr 30 13:46:00 2002
--- emacs/lisp/ediff-hook.el    Wed Sep 18 00:23:27 2002
***************
*** 44,49 ****
--- 44,50 ----
  ;; end pacifier
  
  ;; allow menus to be set up without ediff-wind.el being loaded
+ ;;;###autoload
  (defvar ediff-window-setup-function)
  
  ;; This macro is used to avoid compilation warnings.
***************
*** 51,62 ****
--- 52,65 ----
  ;; compiler at hand (emacs or xemacs).
  ;; The autoload, below, is useless in Emacs because ediff-hook.el
  ;; is dumped with emacs, but it is needed in XEmacs
+ ;;;###autoload
  (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
    (if (string-match "XEmacs" emacs-version)
        xemacs-form emacs-form))
   
  ;; This autoload is useless in Emacs because ediff-hook.el is dumped with
  ;; emacs, but it is needed in XEmacs
+ ;;;###autoload
  (ediff-cond-compile-for-xemacs-or-emacs
   ;; xemacs form
   (defun ediff-xemacs-init-menus ()
***************
*** 79,84 ****
--- 82,88 ----
  
  ;; This autoload is useless in Emacs because ediff-hook.el is dumped with
  ;; emacs, but it is needed in XEmacs
+ ;;;###autoload
  (ediff-cond-compile-for-xemacs-or-emacs
   (progn
     (defvar ediff-menu