diff options
| author | Richard M. Stallman | 2002-09-19 01:02:06 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2002-09-19 01:02:06 +0000 |
| commit | a6b194caa85681196684f092d779590ff005afb8 (patch) | |
| tree | 3f95e6802bc6fd3fd5d39be74a321a049c7a7adc | |
| parent | 9e9a579219112cf41e352436456aff78812e2a9b (diff) | |
| download | emacs-a6b194caa85681196684f092d779590ff005afb8.tar.gz emacs-a6b194caa85681196684f092d779590ff005afb8.zip | |
(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.el | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ | |||
| 52 | ;; compiler at hand (emacs or xemacs). | 52 | ;; compiler at hand (emacs or xemacs). |
| 53 | ;; The autoload, below, is useless in Emacs because ediff-hook.el | 53 | ;; The autoload, below, is useless in Emacs because ediff-hook.el |
| 54 | ;; is dumped with emacs, but it is needed in XEmacs | 54 | ;; is dumped with emacs, but it is needed in XEmacs |
| 55 | ;;;###autoload | 55 | ;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (string-match "XEmacs" emacs-version) xemacs-form emacs-form)) |
| 56 | |||
| 56 | (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) | 57 | (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) |
| 57 | (if (string-match "XEmacs" emacs-version) | 58 | (if (string-match "XEmacs" emacs-version) |
| 58 | xemacs-form emacs-form)) | 59 | xemacs-form emacs-form)) |