From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 19 Sep 2002 01:02:06 +0000 (+0000)
Subject: (ediff-cond-compile-for-xemacs-or-emacs): Put the
X-Git-Tag: ttn-vms-21-2-B4~13116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6b194caa85681196684f092d779590ff005afb8;p=emacs.git

(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 23baeb49d7d..f1be60e424b 100644
--- 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))