diff options
| author | Lute Kamstra | 2005-05-20 13:35:11 +0000 |
|---|---|---|
| committer | Lute Kamstra | 2005-05-20 13:35:11 +0000 |
| commit | d676819ef55543df704704ebfce0d9e4c76b3d1a (patch) | |
| tree | fa6898a3b8360df7e53f2eb544c4197a0fe79f28 /lisp/diff-mode.el | |
| parent | 4e19eff09a43e290f20169b57e2b623d63a954f9 (diff) | |
| download | emacs-d676819ef55543df704704ebfce0d9e4c76b3d1a.tar.gz emacs-d676819ef55543df704704ebfce0d9e4c76b3d1a.zip | |
(diff-header-face, diff-file-header-face)
(diff-index-face, diff-hunk-header-face, diff-removed-face)
(diff-added-face, diff-changed-face, diff-function-face)
(diff-context-face, diff-nonexistent-face): Put them in the
diff-mode customization group.
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index c16738f6570..aabd09e98ee 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -185,7 +185,8 @@ when editing big diffs)." | |||
| 185 | (((class color) (background dark)) | 185 | (((class color) (background dark)) |
| 186 | :foreground "green" :weight bold) | 186 | :foreground "green" :weight bold) |
| 187 | (t :weight bold)) | 187 | (t :weight bold)) |
| 188 | "`diff-mode' face inherited by hunk and index header faces.") | 188 | "`diff-mode' face inherited by hunk and index header faces." |
| 189 | :group 'diff-mode) | ||
| 189 | (defvar diff-header-face 'diff-header-face) | 190 | (defvar diff-header-face 'diff-header-face) |
| 190 | 191 | ||
| 191 | (defface diff-file-header-face | 192 | (defface diff-file-header-face |
| @@ -198,27 +199,32 @@ when editing big diffs)." | |||
| 198 | (((class color) (background dark)) | 199 | (((class color) (background dark)) |
| 199 | :foreground "cyan" :weight bold) | 200 | :foreground "cyan" :weight bold) |
| 200 | (t :weight bold)) ; :height 1.3 | 201 | (t :weight bold)) ; :height 1.3 |
| 201 | "`diff-mode' face used to highlight file header lines.") | 202 | "`diff-mode' face used to highlight file header lines." |
| 203 | :group 'diff-mode) | ||
| 202 | (defvar diff-file-header-face 'diff-file-header-face) | 204 | (defvar diff-file-header-face 'diff-file-header-face) |
| 203 | 205 | ||
| 204 | (defface diff-index-face | 206 | (defface diff-index-face |
| 205 | '((t :inherit diff-file-header-face)) | 207 | '((t :inherit diff-file-header-face)) |
| 206 | "`diff-mode' face used to highlight index header lines.") | 208 | "`diff-mode' face used to highlight index header lines." |
| 209 | :group 'diff-mode) | ||
| 207 | (defvar diff-index-face 'diff-index-face) | 210 | (defvar diff-index-face 'diff-index-face) |
| 208 | 211 | ||
| 209 | (defface diff-hunk-header-face | 212 | (defface diff-hunk-header-face |
| 210 | '((t :inherit diff-header-face)) | 213 | '((t :inherit diff-header-face)) |
| 211 | "`diff-mode' face used to highlight hunk header lines.") | 214 | "`diff-mode' face used to highlight hunk header lines." |
| 215 | :group 'diff-mode) | ||
| 212 | (defvar diff-hunk-header-face 'diff-hunk-header-face) | 216 | (defvar diff-hunk-header-face 'diff-hunk-header-face) |
| 213 | 217 | ||
| 214 | (defface diff-removed-face | 218 | (defface diff-removed-face |
| 215 | '((t :inherit diff-changed-face)) | 219 | '((t :inherit diff-changed-face)) |
| 216 | "`diff-mode' face used to highlight removed lines.") | 220 | "`diff-mode' face used to highlight removed lines." |
| 221 | :group 'diff-mode) | ||
| 217 | (defvar diff-removed-face 'diff-removed-face) | 222 | (defvar diff-removed-face 'diff-removed-face) |
| 218 | 223 | ||
| 219 | (defface diff-added-face | 224 | (defface diff-added-face |
| 220 | '((t :inherit diff-changed-face)) | 225 | '((t :inherit diff-changed-face)) |
| 221 | "`diff-mode' face used to highlight added lines.") | 226 | "`diff-mode' face used to highlight added lines." |
| 227 | :group 'diff-mode) | ||
| 222 | (defvar diff-added-face 'diff-added-face) | 228 | (defvar diff-added-face 'diff-added-face) |
| 223 | 229 | ||
| 224 | (defface diff-changed-face | 230 | (defface diff-changed-face |
| @@ -226,12 +232,14 @@ when editing big diffs)." | |||
| 226 | :foreground "magenta" :weight bold :slant italic) | 232 | :foreground "magenta" :weight bold :slant italic) |
| 227 | (((type tty pc) (class color) (background dark)) | 233 | (((type tty pc) (class color) (background dark)) |
| 228 | :foreground "yellow" :weight bold :slant italic)) | 234 | :foreground "yellow" :weight bold :slant italic)) |
| 229 | "`diff-mode' face used to highlight changed lines.") | 235 | "`diff-mode' face used to highlight changed lines." |
| 236 | :group 'diff-mode) | ||
| 230 | (defvar diff-changed-face 'diff-changed-face) | 237 | (defvar diff-changed-face 'diff-changed-face) |
| 231 | 238 | ||
| 232 | (defface diff-function-face | 239 | (defface diff-function-face |
| 233 | '((t :inherit diff-context-face)) | 240 | '((t :inherit diff-context-face)) |
| 234 | "`diff-mode' face used to highlight function names produced by \"diff -p\".") | 241 | "`diff-mode' face used to highlight function names produced by \"diff -p\"." |
| 242 | :group 'diff-mode) | ||
| 235 | (defvar diff-function-face 'diff-function-face) | 243 | (defvar diff-function-face 'diff-function-face) |
| 236 | 244 | ||
| 237 | (defface diff-context-face | 245 | (defface diff-context-face |
| @@ -239,12 +247,14 @@ when editing big diffs)." | |||
| 239 | :foreground "grey50") | 247 | :foreground "grey50") |
| 240 | (((class color) (background dark)) | 248 | (((class color) (background dark)) |
| 241 | :foreground "grey70")) | 249 | :foreground "grey70")) |
| 242 | "`diff-mode' face used to highlight context and other side-information.") | 250 | "`diff-mode' face used to highlight context and other side-information." |
| 251 | :group 'diff-mode) | ||
| 243 | (defvar diff-context-face 'diff-context-face) | 252 | (defvar diff-context-face 'diff-context-face) |
| 244 | 253 | ||
| 245 | (defface diff-nonexistent-face | 254 | (defface diff-nonexistent-face |
| 246 | '((t :inherit diff-file-header-face)) | 255 | '((t :inherit diff-file-header-face)) |
| 247 | "`diff-mode' face used to highlight nonexistent files in recursive diffs.") | 256 | "`diff-mode' face used to highlight nonexistent files in recursive diffs." |
| 257 | :group 'diff-mode) | ||
| 248 | (defvar diff-nonexistent-face 'diff-nonexistent-face) | 258 | (defvar diff-nonexistent-face 'diff-nonexistent-face) |
| 249 | 259 | ||
| 250 | (defconst diff-yank-handler '(diff-yank-function)) | 260 | (defconst diff-yank-handler '(diff-yank-function)) |