diff options
| author | Juri Linkov | 2019-10-19 23:51:03 +0300 |
|---|---|---|
| committer | Juri Linkov | 2019-10-19 23:51:03 +0300 |
| commit | 7e238e7d50872d43a137c1350cb3b293aea176c2 (patch) | |
| tree | c0c419cfd199ecb32956787a252368a6c0fb31cd /lisp/vc/diff-mode.el | |
| parent | ab7db2814f6bf0a02d533d2cbf1a3d5160a7a007 (diff) | |
| download | emacs-7e238e7d50872d43a137c1350cb3b293aea176c2.tar.gz emacs-7e238e7d50872d43a137c1350cb3b293aea176c2.zip | |
Add ':extend t' face attribute to diff faces (bug#37774)
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Add ':extend t' face attribute.
* lisp/vc/ediff-init.el (ediff-current-diff-A)
(ediff-current-diff-B, ediff-current-diff-C)
(ediff-current-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor): Add ':extend t' face attribute.
* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base, smerge-markers): Add ':extend t' face attribute.
* lisp/vc/log-view.el (log-view-file, log-view-message):
Add ':extend t' face attribute.
* lisp/faces.el (secondary-selection): Add ':extend t' face attribute.
(line-number-major-tick, line-number-minor-tick):
Change :foreground to :background.
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index c86f15cee00..dfac1cca808 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el | |||
| @@ -298,9 +298,9 @@ well." | |||
| 298 | 298 | ||
| 299 | (defface diff-header | 299 | (defface diff-header |
| 300 | '((((class color) (min-colors 88) (background light)) | 300 | '((((class color) (min-colors 88) (background light)) |
| 301 | :background "grey85") | 301 | :background "grey85" :extend t) |
| 302 | (((class color) (min-colors 88) (background dark)) | 302 | (((class color) (min-colors 88) (background dark)) |
| 303 | :background "grey45") | 303 | :background "grey45" :extend t) |
| 304 | (((class color)) | 304 | (((class color)) |
| 305 | :foreground "blue1" :weight bold) | 305 | :foreground "blue1" :weight bold) |
| 306 | (t :weight bold)) | 306 | (t :weight bold)) |
| @@ -308,9 +308,9 @@ well." | |||
| 308 | 308 | ||
| 309 | (defface diff-file-header | 309 | (defface diff-file-header |
| 310 | '((((class color) (min-colors 88) (background light)) | 310 | '((((class color) (min-colors 88) (background light)) |
| 311 | :background "grey75" :weight bold) | 311 | :background "grey75" :weight bold :extend t) |
| 312 | (((class color) (min-colors 88) (background dark)) | 312 | (((class color) (min-colors 88) (background dark)) |
| 313 | :background "grey60" :weight bold) | 313 | :background "grey60" :weight bold :extend t) |
| 314 | (((class color)) | 314 | (((class color)) |
| 315 | :foreground "cyan" :weight bold) | 315 | :foreground "cyan" :weight bold) |
| 316 | (t :weight bold)) ; :height 1.3 | 316 | (t :weight bold)) ; :height 1.3 |
| @@ -328,11 +328,11 @@ well." | |||
| 328 | '((default | 328 | '((default |
| 329 | :inherit diff-changed) | 329 | :inherit diff-changed) |
| 330 | (((class color) (min-colors 257) (background light)) | 330 | (((class color) (min-colors 257) (background light)) |
| 331 | :background "#ffeeee") | 331 | :background "#ffeeee" :extend t) |
| 332 | (((class color) (min-colors 88) (background light)) | 332 | (((class color) (min-colors 88) (background light)) |
| 333 | :background "#ffdddd") | 333 | :background "#ffdddd" :extend t) |
| 334 | (((class color) (min-colors 88) (background dark)) | 334 | (((class color) (min-colors 88) (background dark)) |
| 335 | :background "#553333") | 335 | :background "#553333" :extend t) |
| 336 | (((class color)) | 336 | (((class color)) |
| 337 | :foreground "red")) | 337 | :foreground "red")) |
| 338 | "`diff-mode' face used to highlight removed lines.") | 338 | "`diff-mode' face used to highlight removed lines.") |
| @@ -341,11 +341,11 @@ well." | |||
| 341 | '((default | 341 | '((default |
| 342 | :inherit diff-changed) | 342 | :inherit diff-changed) |
| 343 | (((class color) (min-colors 257) (background light)) | 343 | (((class color) (min-colors 257) (background light)) |
| 344 | :background "#eeffee") | 344 | :background "#eeffee" :extend t) |
| 345 | (((class color) (min-colors 88) (background light)) | 345 | (((class color) (min-colors 88) (background light)) |
| 346 | :background "#ddffdd") | 346 | :background "#ddffdd" :extend t) |
| 347 | (((class color) (min-colors 88) (background dark)) | 347 | (((class color) (min-colors 88) (background dark)) |
| 348 | :background "#335533") | 348 | :background "#335533" :extend t) |
| 349 | (((class color)) | 349 | (((class color)) |
| 350 | :foreground "green")) | 350 | :foreground "green")) |
| 351 | "`diff-mode' face used to highlight added lines.") | 351 | "`diff-mode' face used to highlight added lines.") |