diff options
| author | Juri Linkov <[email protected]> | 2014-06-18 11:48:49 +0300 |
|---|---|---|
| committer | Juri Linkov <[email protected]> | 2014-06-18 11:48:49 +0300 |
| commit | 1a63945352257ede0289d37dd8a71e2cfa84f2ea (patch) | |
| tree | d06aec3cfe948b11d6eead9267226c7c3d61f242 /lisp | |
| parent | 7c6fc37fa9a78a7a02f3f0ccb46a95c20fe315b4 (diff) | |
* lisp/vc/diff-mode.el (diff-changed): Empty face definition
to use `diff-removed' and `diff-added' on tty as well.
(diff-context): Use darker color on light background and
lighter color on dark background.
Fixes: debbugs:10181
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/vc/diff-mode.el | 15 |
2 files changed, 14 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1f0bf124c7..c8229b6eb2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2014-06-18 Juri Linkov <[email protected]> + * vc/diff-mode.el (diff-changed): Empty face definition to use + `diff-removed' and `diff-added' on tty as well. (Bug#10181) + (diff-context): Use darker color on light background and + lighter color on dark background. + +2014-06-18 Juri Linkov <[email protected]> + * vc/diff-mode.el (diff-refine-changed): Rename from `diff-refine-change' for consistency with `diff-changed'. (diff-refine-change): Add obsolete face alias. (Bug#10181) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 3d985d9ca4..4908c5f496 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -302,14 +302,9 @@ well." (defvar diff-added-face 'diff-added) (defface diff-changed - ;; We normally apply a `shadow'-based face on the `diff-context' - ;; face, and keep `diff-changed' the default. - '((((class color grayscale) (min-colors 88))) - ;; If the terminal lacks sufficient colors for shadowing, - ;; highlight changed lines explicitly. - (((class color)) - :foreground "yellow")) + '((t nil)) "`diff-mode' face used to highlight changed lines." + :version "24.5" :group 'diff-mode) (define-obsolete-face-alias 'diff-changed-face 'diff-changed "22.1") (defvar diff-changed-face 'diff-changed) @@ -343,8 +338,12 @@ well." (defvar diff-function-face 'diff-function) (defface diff-context - '((((class color grayscale) (min-colors 88)) :inherit shadow)) + '((((class color grayscale) (min-colors 88) (background light)) + :foreground "#333333") + (((class color grayscale) (min-colors 88) (background dark)) + :foreground "#dddddd")) "`diff-mode' face used to highlight context and other side-information." + :version "24.5" :group 'diff-mode) (define-obsolete-face-alias 'diff-context-face 'diff-context "22.1") (defvar diff-context-face 'diff-context) |