diff options
| author | Miles Bader <miles@gnu.org> | 2005-06-10 08:48:08 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-06-10 08:48:08 +0000 |
| commit | e8bfdf824f2741384e9ce2220fc84f2375b76abe (patch) | |
| tree | 8c55d35e00587db1060ea47eaa9642b13602b234 /lisp/smerge-mode.el | |
| parent | 342c350fb7ae8f950e857555adbdf4a1af029cce (diff) | |
| download | emacs-e8bfdf824f2741384e9ce2220fc84f2375b76abe.tar.gz | |
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Remove "-face" suffix from smerge faces
2005-06-10 Miles Bader <miles@gnu.org>
* lisp/smerge-mode.el (smerge-mine, smerge-other, smerge-base)
(smerge-markers): Remove "-face" suffix from face names.
(smerge-mine-face, smerge-other-face, smerge-base-face)
(smerge-markers-face):
New backward-compatibility aliases for renamed faces.
(smerge-mine-face, smerge-other-face, smerge-base-face)
(smerge-markers-face): Use renamed smerge faces.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 0cab4b31404..cf93ad12cd9 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -75,7 +75,7 @@ Used in `smerge-diff-base-mine' and related functions." :group 'smerge :type 'boolean) -(defface smerge-mine-face +(defface smerge-mine '((((min-colors 88) (background light)) (:foreground "blue1")) (((background light)) @@ -86,18 +86,22 @@ Used in `smerge-diff-base-mine' and related functions." (:foreground "cyan"))) "Face for your code." :group 'smerge) -(defvar smerge-mine-face 'smerge-mine-face) +;; backward-compatibility alias +(put 'smerge-mine-face 'face-alias 'smerge-mine) +(defvar smerge-mine-face 'smerge-mine) -(defface smerge-other-face +(defface smerge-other '((((background light)) (:foreground "darkgreen")) (((background dark)) (:foreground "lightgreen"))) "Face for the other code." :group 'smerge) -(defvar smerge-other-face 'smerge-other-face) +;; backward-compatibility alias +(put 'smerge-other-face 'face-alias 'smerge-other) +(defvar smerge-other-face 'smerge-other) -(defface smerge-base-face +(defface smerge-base '((((min-colors 88) (background light)) (:foreground "red1")) (((background light)) @@ -106,16 +110,20 @@ Used in `smerge-diff-base-mine' and related functions." (:foreground "orange"))) "Face for the base code." :group 'smerge) -(defvar smerge-base-face 'smerge-base-face) +;; backward-compatibility alias +(put 'smerge-base-face 'face-alias 'smerge-base) +(defvar smerge-base-face 'smerge-base) -(defface smerge-markers-face +(defface smerge-markers '((((background light)) (:background "grey85")) (((background dark)) (:background "grey30"))) "Face for the conflict markers." :group 'smerge) -(defvar smerge-markers-face 'smerge-markers-face) +;; 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) |