Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.34 emacs/lisp/smerge-mode.el:1.35
*** emacs/lisp/smerge-mode.el:1.34 Fri Apr 8 14:26:13 2005
--- emacs/lisp/smerge-mode.el Fri Jun 10 08:48:07 2005
***************
*** 75,81 ****
:group 'smerge
:type 'boolean)
! (defface smerge-mine-face
'((((min-colors 88) (background light))
(:foreground "blue1"))
(((background light))
--- 75,81 ----
:group 'smerge
:type 'boolean)
! (defface smerge-mine
'((((min-colors 88) (background light))
(:foreground "blue1"))
(((background light))
***************
*** 86,103 ****
(:foreground "cyan")))
"Face for your code."
:group 'smerge)
! (defvar smerge-mine-face 'smerge-mine-face)
! (defface smerge-other-face
'((((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
'((((min-colors 88) (background light))
(:foreground "red1"))
(((background light))
--- 86,107 ----
(:foreground "cyan")))
"Face for your code."
:group 'smerge)
! ;; backward-compatibility alias
! (put 'smerge-mine-face 'face-alias 'smerge-mine)
! (defvar smerge-mine-face 'smerge-mine)
! (defface smerge-other
'((((background light))
(:foreground "darkgreen"))
(((background dark))
(:foreground "lightgreen")))
"Face for the other code."
:group 'smerge)
! ;; backward-compatibility alias
! (put 'smerge-other-face 'face-alias 'smerge-other)
! (defvar smerge-other-face 'smerge-other)
! (defface smerge-base
'((((min-colors 88) (background light))
(:foreground "red1"))
(((background light))
***************
*** 106,121 ****
(:foreground "orange")))
"Face for the base code."
:group 'smerge)
! (defvar smerge-base-face 'smerge-base-face)
! (defface smerge-markers-face
'((((background light))
(:background "grey85"))
(((background dark))
(:background "grey30")))
"Face for the conflict markers."
:group 'smerge)
! (defvar smerge-markers-face 'smerge-markers-face)
(easy-mmode-defmap smerge-basic-map
`(("n" . smerge-next)
--- 110,129 ----
(:foreground "orange")))
"Face for the base code."
:group 'smerge)
! ;; backward-compatibility alias
! (put 'smerge-base-face 'face-alias 'smerge-base)
! (defvar smerge-base-face 'smerge-base)
! (defface smerge-markers
'((((background light))
(:background "grey85"))
(((background dark))
(:background "grey30")))
"Face for the conflict markers."
:group 'smerge)
! ;; backward-compatibility alias
! (put 'smerge-markers-face 'face-alias 'smerge-markers)
! (defvar smerge-markers-face 'smerge-markers)
(easy-mmode-defmap smerge-basic-map
`(("n" . smerge-next)
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
