Mercurial > emacs
diff lisp/ediff-hook.el @ 91073:4bc33ffdda1a
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 27 Oct 2007 09:12:07 +0000 |
parents | f55f9811f5d7 f873840f9fea |
children | 880960b70474 |
line wrap: on
line diff
--- a/lisp/ediff-hook.el Sat Oct 27 00:30:50 2007 +0000 +++ b/lisp/ediff-hook.el Sat Oct 27 09:12:07 2007 +0000 @@ -53,10 +53,10 @@ ;; 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 (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (string-match "XEmacs" emacs-version) xemacs-form emacs-form)) +;;;###autoload (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) (if (featurep 'xemacs) xemacs-form emacs-form)) (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) - (if (string-match "XEmacs" emacs-version) + (if (featurep 'xemacs) xemacs-form emacs-form)) ;; This autoload is useless in Emacs because ediff-hook.el is dumped with