diff options
author | Dan Nicolaescu <[email protected]> | 2005-04-08 14:26:13 +0000 |
---|---|---|
committer | Dan Nicolaescu <[email protected]> | 2005-04-08 14:26:13 +0000 |
commit | ea81d57ec51f81205135e3ce340345a159f9269f (patch) | |
tree | 8482585cdc1a364fe901d1930480be1f6fabd1bb /lisp/smerge-mode.el | |
parent | 67b4790bd3382424c3276ca5686e2cd45c3f5807 (diff) |
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
high number of colors displays.
* textmodes/table.el (table-cell-face): Add special case for
displays supporting a high number of colors.
* progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
(vhdl-font-lock-reserved-words-face)
(vhdl-speedbar-architecture-face)
(vhdl-speedbar-instantiation-face)
(vhdl-speedbar-architecture-selected-face)
(vhdl-speedbar-instantiation-selected-face): Likewise.
* progmodes/sh-script.el (sh-heredoc-face): Likewise.
* progmodes/idlw-help.el (idlwave-help-link-face): Likewise.
* progmodes/ebrowse.el (ebrowse-tree-mark-face)
(ebrowse-root-class-face, ebrowse-member-attribute-face)
(ebrowse-progress-face): Likewise.
* progmodes/compile.el (compilation-info-face): Likewise.
* progmodes/cc-fonts.el (c-invalid-face): Likewise.
* emacs-lisp/re-builder.el (reb-match-3): Likewise.
* calendar/calendar.el (diary-face): Likewise.
* woman.el (woman-italic-face, woman-bold-face)
(woman-unknown-face): Likewise.
* wid-edit.el (widget-button-pressed-face): Likewise.
* whitespace.el (whitespace-highlight-face): Likewise.
* smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise.
* pcvs-info.el (cvs-marked-face): Likewise.
* info.el (info-xref): Likewise.
* ido.el (ido-subdir-face, ido-indicator-face): Likewise.
* hilit-chg.el (highlight-changes-face)
(highlight-changes-delete-face): Likewise.
* hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b)
(hi-red-b): Likewise.
* generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise.
* font-lock.el (font-lock-keyword-face)
(font-lock-function-name-face, font-lock-warning-face): Likewise.
* cus-edit.el (custom-invalid-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-variable-tag-face)
(custom-group-tag-face-1, custom-group-tag-face): Likewise.
* comint.el (comint-highlight-prompt): Likewise.
Diffstat (limited to 'lisp/smerge-mode.el')
-rw-r--r-- | lisp/smerge-mode.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index d6a93a935d..0cab4b3140 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -76,8 +76,12 @@ Used in `smerge-diff-base-mine' and related functions." :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 @@ Used in `smerge-diff-base-mine' and related functions." (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"))) |