(ediff-cond-compile-for-xemacs-or-emacs): Put the

definition straight into loaddefs.el as well as executing it here.

diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 23baeb49d7d8e316dac3fe6b79447e0d1571af1f..f1be60e424b586e92ecf966b3abfb1e021807b7b 100644 (file)
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -52,7 +52,8 @@
 ;; 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
+;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (string-match "XEmacs" emacs-version) xemacs-form emacs-form))
+
 (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
   (if (string-match "XEmacs" emacs-version)
       xemacs-form emacs-form))