aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>2002-09-19 01:02:06 +0000
committerRichard M. Stallman <[email protected]>2002-09-19 01:02:06 +0000
commita6b194caa85681196684f092d779590ff005afb8 (patch)
tree3f95e6802bc6fd3fd5d39be74a321a049c7a7adc
parent9e9a579219112cf41e352436456aff78812e2a9b (diff)
(ediff-cond-compile-for-xemacs-or-emacs): Put the
definition straight into loaddefs.el as well as executing it here.
-rw-r--r--lisp/ediff-hook.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 23baeb49d7..f1be60e424 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))