Mercurial > emacs

changeset 61310:4efad09bd407

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use (featurep 'xemacs).
author Kim F. Storm <storm@cua.dk>
date Tue, 05 Apr 2005 08:10:00 +0000
parents ebfe038b7e6c
children e768c2d3772a
files lisp/ediff-init.el
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ediff-init.el	Tue Apr 05 08:09:49 2005 +0000
+++ b/lisp/ediff-init.el	Tue Apr 05 08:10:00 2005 +0000
@@ -1,6 +1,7 @@
 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
 
-;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 04 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+;;     2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -43,7 +44,7 @@
 ;; end pacifier
 
 ;; Is it XEmacs?
-(defconst ediff-xemacs-p (string-match "XEmacs" emacs-version))
+(defconst ediff-xemacs-p (featurep 'xemacs))
 ;; Is it Emacs?
 (defconst ediff-emacs-p (not ediff-xemacs-p))
 
@@ -53,7 +54,7 @@
 ;; compiler at hand.
 ;; Suggested by rms.
 (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))
 
 (defvar ediff-force-faces nil
@@ -1145,9 +1146,9 @@
 
 (defface ediff-even-diff-face-B
   (if ediff-emacs-p
-      `((((class color) (min-colors 16)) 
+      `((((class color) (min-colors 16))
 	 (:foreground "White" :background "Grey"))
-	(((class color))    
+	(((class color))
 	 (:foreground "blue3" :background "Grey" :weight bold))
 	(t		     (:italic t :stipple ,stipple-pixmap)))
     `((((type tty))    (:foreground "blue3" :background "Grey" :weight bold))