diff options
| author | Juri Linkov <[email protected]> | 2012-09-30 19:36:42 +0300 |
|---|---|---|
| committer | Juri Linkov <[email protected]> | 2012-09-30 19:36:42 +0300 |
| commit | d80d54b289a971d7a98dc5fafebaa957082c8222 (patch) | |
| tree | 16e9835c084e67898a0b976ebfc86d9d4fe274ac /lisp/vc | |
| parent | c06c382ae494c4129da43f2c1ea0f72e39a45bf1 (diff) | |
* lisp/facemenu.el (list-colors-sort): Add option "Luminance".
(list-colors-sort-key): Implement it.
* lisp/vc/diff-mode.el (diff-refine-removed):
* lisp/vc/ediff-init.el (ediff-fine-diff-A):
* lisp/vc/smerge-mode.el (smerge-refined-removed):
Change background color "#ffaaaa" to "#ffbbbb".
Fixes: debbugs:10181
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 | ||||
| -rw-r--r-- | lisp/vc/ediff-init.el | 2 | ||||
| -rw-r--r-- | lisp/vc/smerge-mode.el | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 11ec785b64..586dd2b75e 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1899,7 +1899,7 @@ For use in `add-log-current-defun-function'." '((default :inherit diff-refine-change) (((class color) (min-colors 88) (background light)) - :background "#ffaaaa") + :background "#ffbbbb") (((class color) (min-colors 88) (background dark)) :background "#aa2222")) "Face used for removed characters shown by `diff-refine-hunk'." diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 2c41ce8c45..65776dfcca 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -979,7 +979,7 @@ this variable represents.") (defface ediff-fine-diff-A (if (featurep 'emacs) '((((class color) (min-colors 88) (background light)) - :background "#ffaaaa") + :background "#ffbbbb") (((class color) (min-colors 88) (background dark)) :background "#aa2222") (((class color) (min-colors 16)) diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index babcf6f1be..7037b606fe 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -132,7 +132,7 @@ Used in `smerge-diff-base-mine' and related functions." '((default :inherit smerge-refined-change) (((class color) (min-colors 88) (background light)) - :background "#ffaaaa") + :background "#ffbbbb") (((class color) (min-colors 88) (background dark)) :background "#aa2222") (t :inverse-video t)) |