Mercurial > emacs
comparison lisp/ediff-init.el @ 90140:02f1dbc4a199
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 228-240)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 53-58)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Collapse feature addition/removal within single ChangeLog entry
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 09 Apr 2005 02:16:29 +0000 |
parents | bf0d492ea2d5 4efad09bd407 |
children | b7da78284d4c |
comparison
equal
deleted
inserted
replaced
90139:e0d294b9b23e | 90140:02f1dbc4a199 |
---|---|
1 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff | 1 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff |
2 | 2 |
3 ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 04 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4 ;; 2004, 2005 Free Software Foundation, Inc. | |
4 | 5 |
5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
6 | 7 |
7 ;; This file is part of GNU Emacs. | 8 ;; This file is part of GNU Emacs. |
8 | 9 |
41 (eval-when-compile | 42 (eval-when-compile |
42 (load "ange-ftp" 'noerror))) | 43 (load "ange-ftp" 'noerror))) |
43 ;; end pacifier | 44 ;; end pacifier |
44 | 45 |
45 ;; Is it XEmacs? | 46 ;; Is it XEmacs? |
46 (defconst ediff-xemacs-p (string-match "XEmacs" emacs-version)) | 47 (defconst ediff-xemacs-p (featurep 'xemacs)) |
47 ;; Is it Emacs? | 48 ;; Is it Emacs? |
48 (defconst ediff-emacs-p (not ediff-xemacs-p)) | 49 (defconst ediff-emacs-p (not ediff-xemacs-p)) |
49 | 50 |
50 ;; This is used to avoid compilation warnings. When emacs/xemacs forms can | 51 ;; This is used to avoid compilation warnings. When emacs/xemacs forms can |
51 ;; generate compile time warnings, we use this macro. | 52 ;; generate compile time warnings, we use this macro. |
52 ;; In this case, the macro will expand into the form that is appropriate to the | 53 ;; In this case, the macro will expand into the form that is appropriate to the |
53 ;; compiler at hand. | 54 ;; compiler at hand. |
54 ;; Suggested by rms. | 55 ;; Suggested by rms. |
55 (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) | 56 (defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) |
56 (if (string-match "XEmacs" emacs-version) | 57 (if (featurep 'xemacs) |
57 xemacs-form emacs-form)) | 58 xemacs-form emacs-form)) |
58 | 59 |
59 (defvar ediff-force-faces nil | 60 (defvar ediff-force-faces nil |
60 "If t, Ediff will think that it is running on a display that supports faces. | 61 "If t, Ediff will think that it is running on a display that supports faces. |
61 This is provided as a temporary relief for users of face-capable displays | 62 This is provided as a temporary relief for users of face-capable displays |
1143 this variable represents.") | 1144 this variable represents.") |
1144 (ediff-hide-face 'ediff-even-diff-face-A) | 1145 (ediff-hide-face 'ediff-even-diff-face-A) |
1145 | 1146 |
1146 (defface ediff-even-diff-face-B | 1147 (defface ediff-even-diff-face-B |
1147 (if ediff-emacs-p | 1148 (if ediff-emacs-p |
1148 `((((class color) (min-colors 16)) | 1149 `((((class color) (min-colors 16)) |
1149 (:foreground "White" :background "Grey")) | 1150 (:foreground "White" :background "Grey")) |
1150 (((class color)) | 1151 (((class color)) |
1151 (:foreground "blue3" :background "Grey" :weight bold)) | 1152 (:foreground "blue3" :background "Grey" :weight bold)) |
1152 (t (:italic t :stipple ,stipple-pixmap))) | 1153 (t (:italic t :stipple ,stipple-pixmap))) |
1153 `((((type tty)) (:foreground "blue3" :background "Grey" :weight bold)) | 1154 `((((type tty)) (:foreground "blue3" :background "Grey" :weight bold)) |
1154 (((class color)) (:foreground "White" :background "Grey")) | 1155 (((class color)) (:foreground "White" :background "Grey")) |
1155 (t (:italic t :stipple ,stipple-pixmap)))) | 1156 (t (:italic t :stipple ,stipple-pixmap)))) |