diff options
| author | Eli Zaretskii | 2000-10-17 12:12:00 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2000-10-17 12:12:00 +0000 |
| commit | 86a27a3a100833763334d92b58aa68e18f6ebd12 (patch) | |
| tree | cc70d4dcc8d9c20dcca3c75b945858b07ae2f7d8 /lisp/diff-mode.el | |
| parent | d3c5bad2624c40196ff93bdaabdafc71744723e0 (diff) | |
| download | emacs-86a27a3a100833763334d92b58aa68e18f6ebd12.tar.gz emacs-86a27a3a100833763334d92b58aa68e18f6ebd12.zip | |
(diff-header-face, diff-file-header-face)
(diff-changed-face): Define tty-specific colors.
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 42fd7edbfcb..48fd92b764f 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 6 | ;; Keywords: patch diff | 6 | ;; Keywords: patch diff |
| 7 | ;; Revision: $Id: diff-mode.el,v 1.28 2000/10/04 21:29:59 miles Exp $ | 7 | ;; Revision: $Id: diff-mode.el,v 1.29 2000/10/15 04:49:55 monnier Exp $ |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
| @@ -168,15 +168,23 @@ when editing big diffs)." | |||
| 168 | ;;;; | 168 | ;;;; |
| 169 | 169 | ||
| 170 | (defface diff-header-face | 170 | (defface diff-header-face |
| 171 | '((((class color) (background light)) | 171 | '((((type tty pc) (class color) (background light)) |
| 172 | (:foreground "lightblue")) | ||
| 173 | (((type tty pc) (class color) (background dark)) | ||
| 174 | (:foreground "green")) | ||
| 175 | (((class color) (background light)) | ||
| 172 | (:background "grey85")) | 176 | (:background "grey85")) |
| 173 | (t (:bold t))) | 177 | (t (:bold t))) |
| 174 | "`diff-mode' face inherited by hunk, file and index header faces." | 178 | "`diff-mode' face inherited by hunk and index header faces." |
| 175 | :group 'diff-mode) | 179 | :group 'diff-mode) |
| 176 | (defvar diff-header-face 'diff-header-face) | 180 | (defvar diff-header-face 'diff-header-face) |
| 177 | 181 | ||
| 178 | (defface diff-file-header-face | 182 | (defface diff-file-header-face |
| 179 | '((((class color) (background light)) | 183 | '((((type tty pc) (class color) (background light)) |
| 184 | (:foreground "yellow")) | ||
| 185 | (((type tty pc) (class color) (background dark)) | ||
| 186 | (:foreground "cyan")) | ||
| 187 | (((class color) (background light)) | ||
| 180 | (:background "grey70" :bold t)) | 188 | (:background "grey70" :bold t)) |
| 181 | (t (:bold t))) ; :height 1.3 | 189 | (t (:bold t))) ; :height 1.3 |
| 182 | "`diff-mode' face used to highlight file header lines." | 190 | "`diff-mode' face used to highlight file header lines." |
| @@ -208,7 +216,11 @@ when editing big diffs)." | |||
| 208 | (defvar diff-added-face 'diff-added-face) | 216 | (defvar diff-added-face 'diff-added-face) |
| 209 | 217 | ||
| 210 | (defface diff-changed-face | 218 | (defface diff-changed-face |
| 211 | '((t ())) | 219 | '((((type tty pc) (class color) (background light)) |
| 220 | (:foreground "magenta")) | ||
| 221 | (((type tty pc) (class color) (background dark)) | ||
| 222 | (:foreground "yellow")) | ||
| 223 | (t ())) | ||
| 212 | "`diff-mode' face used to highlight changed lines." | 224 | "`diff-mode' face used to highlight changed lines." |
| 213 | :group 'diff-mode) | 225 | :group 'diff-mode) |
| 214 | (defvar diff-changed-face 'diff-changed-face) | 226 | (defvar diff-changed-face 'diff-changed-face) |