diff options
| author | Miles Bader <miles@gnu.org> | 2000-10-05 06:05:51 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2000-10-05 06:05:51 +0000 |
| commit | b25f5aecdf817afe2f7d9d6b213b2adf8762a155 (patch) | |
| tree | 1f35dabc97f82b03dbbdb9f72a52c01e35c21f4f /lisp/smerge-mode.el | |
| parent | 86647e1190649ecd68cf59cfa71c58d7991baeca (diff) | |
| download | emacs-b25f5aecdf817afe2f7d9d6b213b2adf8762a155.tar.gz | |
(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
Add dark-background variants.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index be3887c032c..09c6c45abed 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1,10 +1,10 @@ ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -;; Copyright (C) 1999 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: merge diff3 cvs conflict -;; Revision: $Id: smerge-mode.el,v 1.4 2000/07/21 13:52:19 fx Exp $ +;; Revision: $Id: smerge-mode.el,v 1.5 2000/08/16 19:51:55 monnier Exp $ ;; This file is part of GNU Emacs. @@ -77,25 +77,37 @@ Used in `smerge-diff-base-mine' and related functions." :type 'boolean) (defface smerge-mine-face - '((t (:foreground "blue"))) + '((((background light)) + (:foreground "blue")) + (((background dark)) + (:foreground "cyan"))) "Face for your code." :group 'smerge) (defvar smerge-mine-face 'smerge-mine-face) (defface smerge-other-face - '((t (:foreground "darkgreen"))) + '((((background light)) + (:foreground "darkgreen")) + (((background dark)) + (:foreground "lightgreen"))) "Face for the other code." :group 'smerge) (defvar smerge-other-face 'smerge-other-face) (defface smerge-base-face - '((t (:foreground "red"))) + '((((background light)) + (:foreground "red")) + (((background dark)) + (:foreground "orange"))) "Face for the base code." :group 'smerge) (defvar smerge-base-face 'smerge-base-face) (defface smerge-markers-face - '((t (:background "grey85"))) + '((((background light)) + (:background "grey85")) + (((background dark)) + (:background "grey30"))) "Face for the conflict markers." :group 'smerge) (defvar smerge-markers-face 'smerge-markers-face) @@ -460,6 +472,9 @@ The point is moved to the end of the conflict." ;;; Change Log: ;; $Log: smerge-mode.el,v $ +;; Revision 1.5 2000/08/16 19:51:55 monnier +;; (smerge-mode-menu): Doc fix. +;; ;; Revision 1.4 2000/07/21 13:52:19 fx ;; (smerge-mode-menu): Fill it out. ;; |