Mercurial > emacs

comparison 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
comparison
equal deleted inserted replaced
83285:865f9b91fdbe 83286:9deb6323655c
74 "*Non-nil means to leave `smerge-mode' when the last conflict is resolved." 74 "*Non-nil means to leave `smerge-mode' when the last conflict is resolved."
75 :group 'smerge 75 :group 'smerge
76 :type 'boolean) 76 :type 'boolean)
77 77
78 (defface smerge-mine-face 78 (defface smerge-mine-face
79 '((((background light)) 79 '((((min-colors 88) (background light))
80 (:foreground "blue1"))
81 (((background light))
80 (:foreground "blue")) 82 (:foreground "blue"))
83 (((min-colors 88) (background dark))
84 (:foreground "cyan1"))
81 (((background dark)) 85 (((background dark))
82 (:foreground "cyan"))) 86 (:foreground "cyan")))
83 "Face for your code." 87 "Face for your code."
84 :group 'smerge) 88 :group 'smerge)
85 (defvar smerge-mine-face 'smerge-mine-face) 89 (defvar smerge-mine-face 'smerge-mine-face)
92 "Face for the other code." 96 "Face for the other code."
93 :group 'smerge) 97 :group 'smerge)
94 (defvar smerge-other-face 'smerge-other-face) 98 (defvar smerge-other-face 'smerge-other-face)
95 99
96 (defface smerge-base-face 100 (defface smerge-base-face
97 '((((background light)) 101 '((((min-colors 88) (background light))
102 (:foreground "red1"))
103 (((background light))
98 (:foreground "red")) 104 (:foreground "red"))
99 (((background dark)) 105 (((background dark))
100 (:foreground "orange"))) 106 (:foreground "orange")))
101 "Face for the base code." 107 "Face for the base code."
102 :group 'smerge) 108 :group 'smerge)