Mercurial > emacs

diff lisp/smerge-mode.el @ 83286:9deb6323655c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-240 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-241 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-242 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-244 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-245 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-59 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-326
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 11 Apr 2005 12:40:15 +0000
parents 360860a0006f 31aa9a390538
children e58cb448e07c
line wrap: on
line diff
--- a/lisp/smerge-mode.el	Fri Apr 08 16:25:22 2005 +0000
+++ b/lisp/smerge-mode.el	Mon Apr 11 12:40:15 2005 +0000
@@ -76,8 +76,12 @@
   :type 'boolean)
 
 (defface smerge-mine-face
-  '((((background light))
+  '((((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,7 +98,9 @@
 (defvar smerge-other-face 'smerge-other-face)
 
 (defface smerge-base-face
-  '((((background light))
+  '((((min-colors 88) (background light))
+     (:foreground "red1"))
+    (((background light))
      (:foreground "red"))
     (((background dark))
      (:foreground "orange")))