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

[Richard M. Stallman]

Index: emacs/lisp/ediff-hook.el
diff -c emacs/lisp/ediff-hook.el:1.18 emacs/lisp/ediff-hook.el:1.19
*** emacs/lisp/ediff-hook.el:1.18       Tue Jan  8 11:32:10 2002
--- emacs/lisp/ediff-hook.el    Thu Jan 31 23:16:02 2002
***************
*** 44,50 ****
  ;; end pacifier
  
  ;; allow menus to be set up without ediff-wind.el being loaded
- ;;;###autoload
  (defvar ediff-window-setup-function)
  
  ;; This is used to avoid compilation warnings. When emacs/xemacs forms can
--- 44,49 ----
***************
*** 52,58 ****
  ;; In this case, the macro will expand into the form that is appropriate to 
the
  ;; compiler at hand.
  ;; Suggested by rms.
- ;;;###autoload
  (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
    (if (string-match "XEmacs" emacs-version)
        xemacs-form emacs-form))
--- 51,56 ----
***************
*** 60,66 ****
  ;; Note we wrap this in a progn so that we pick up the whole def
  ;; for auto-autoload. That way we do not load ediff-hook.el when defining
  ;; the menus.
- ;;;###autoload
  (progn
    (ediff-cond-compile-for-xemacs-or-emacs
     ;; xemacs form
--- 58,63 ----
***************
*** 82,88 ****
     ))
  
  
- ;;;###autoload
  (ediff-cond-compile-for-xemacs-or-emacs
   (progn
     (defvar ediff-menu
--- 79,84 ----