[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el |
Date: |
Fri, 08 Apr 2005 10:26:26 -0400 |
Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.33 emacs/lisp/smerge-mode.el:1.34
*** emacs/lisp/smerge-mode.el:1.33 Mon Apr 4 09:09:01 2005
--- emacs/lisp/smerge-mode.el Fri Apr 8 14:26:13 2005
***************
*** 76,83 ****
:type 'boolean)
(defface smerge-mine-face
! '((((background light))
(:foreground "blue"))
(((background dark))
(:foreground "cyan")))
"Face for your code."
--- 76,87 ----
:type 'boolean)
(defface smerge-mine-face
! '((((min-colors 88) (background light))
! (:foreground "blue1"))
! (((background light))
(:foreground "blue"))
+ (((min-colors 88) (background dark))
+ (:foreground "cyan1"))
(((background dark))
(:foreground "cyan")))
"Face for your code."
***************
*** 94,100 ****
(defvar smerge-other-face 'smerge-other-face)
(defface smerge-base-face
! '((((background light))
(:foreground "red"))
(((background dark))
(:foreground "orange")))
--- 98,106 ----
(defvar smerge-other-face 'smerge-other-face)
(defface smerge-base-face
! '((((min-colors 88) (background light))
! (:foreground "red1"))
! (((background light))
(:foreground "red"))
(((background dark))
(:foreground "orange")))