[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-init.el
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-init.el |
Date: |
Tue, 05 Apr 2005 04:10:00 -0400 |
Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.66 emacs/lisp/ediff-init.el:1.67
*** emacs/lisp/ediff-init.el:1.66 Sat Feb 19 04:46:24 2005
--- emacs/lisp/ediff-init.el Tue Apr 5 08:10:00 2005
***************
*** 1,6 ****
;;; 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.
;; Author: Michael Kifer <address@hidden>
--- 1,7 ----
;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
! ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! ;; 2004, 2005 Free Software Foundation, Inc.
;; Author: Michael Kifer <address@hidden>
***************
*** 43,49 ****
;; end pacifier
;; Is it XEmacs?
! (defconst ediff-xemacs-p (string-match "XEmacs" emacs-version))
;; Is it Emacs?
(defconst ediff-emacs-p (not ediff-xemacs-p))
--- 44,50 ----
;; end pacifier
;; Is it XEmacs?
! (defconst ediff-xemacs-p (featurep 'xemacs))
;; Is it Emacs?
(defconst ediff-emacs-p (not ediff-xemacs-p))
***************
*** 53,59 ****
;; compiler at hand.
;; Suggested by rms.
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
! (if (string-match "XEmacs" emacs-version)
xemacs-form emacs-form))
(defvar ediff-force-faces nil
--- 54,60 ----
;; compiler at hand.
;; Suggested by rms.
(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
! (if (featurep 'xemacs)
xemacs-form emacs-form))
(defvar ediff-force-faces nil
***************
*** 1145,1153 ****
(defface ediff-even-diff-face-B
(if ediff-emacs-p
! `((((class color) (min-colors 16))
(:foreground "White" :background "Grey"))
! (((class color))
(:foreground "blue3" :background "Grey" :weight bold))
(t (:italic t :stipple ,stipple-pixmap)))
`((((type tty)) (:foreground "blue3" :background "Grey" :weight bold))
--- 1146,1154 ----
(defface ediff-even-diff-face-B
(if ediff-emacs-p
! `((((class color) (min-colors 16))
(:foreground "White" :background "Grey"))
! (((class color))
(:foreground "blue3" :background "Grey" :weight bold))
(t (:italic t :stipple ,stipple-pixmap)))
`((((type tty)) (:foreground "blue3" :background "Grey" :weight bold))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ediff-init.el,
Kim F . Storm <=