diff options
author | Juri Linkov <juri@linkov.net> | 2019-10-19 23:51:03 +0300 |
---|---|---|
committer | Juri Linkov <juri@linkov.net> | 2019-10-19 23:51:03 +0300 |
commit | 7e238e7d50872d43a137c1350cb3b293aea176c2 (patch) | |
tree | c0c419cfd199ecb32956787a252368a6c0fb31cd /lisp/vc/ediff-init.el | |
parent | ab7db2814f6bf0a02d533d2cbf1a3d5160a7a007 (diff) | |
download | emacs-7e238e7d50872d43a137c1350cb3b293aea176c2.tar.gz |
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/ediff-init.el')
-rw-r--r-- | lisp/vc/ediff-init.el | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 9e4d08d70c8..ca7f4eb8a22 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -806,13 +806,13 @@ to temp files in buffer jobs and when Ediff needs to find fine differences." (defface ediff-current-diff-A '((((class color) (min-colors 88) (background light)) - :background "#ffdddd") + :background "#ffdddd" :extend t) (((class color) (min-colors 88) (background dark)) - :background "#553333") + :background "#553333" :extend t) (((class color) (min-colors 16)) - (:foreground "firebrick" :background "pale green")) + (:foreground "firebrick" :background "pale green" :extend t)) (((class color)) - (:foreground "blue3" :background "yellow3")) + (:foreground "blue3" :background "yellow3" :extend t)) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer A." :group 'ediff-highlighting) @@ -827,14 +827,14 @@ this variable represents.") (defface ediff-current-diff-B '((((class color) (min-colors 88) (background light)) - :background "#ddffdd") + :background "#ddffdd" :extend t) (((class color) (min-colors 88) (background dark)) - :background "#335533") + :background "#335533" :extend t) (((class color) (min-colors 16)) - (:foreground "DarkOrchid" :background "Yellow")) + (:foreground "DarkOrchid" :background "Yellow" :extend t)) (((class color)) (:foreground "magenta3" :background "yellow3" - :weight bold)) + :weight bold :extend t)) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer B." :group 'ediff-highlighting) @@ -849,13 +849,13 @@ this variable represents.") (defface ediff-current-diff-C '((((class color) (min-colors 88) (background light)) - :background "#ffffaa") + :background "#ffffaa" :extend t) (((class color) (min-colors 88) (background dark)) - :background "#888833") + :background "#888833" :extend t) (((class color) (min-colors 16)) - (:foreground "Navy" :background "Pink")) + (:foreground "Navy" :background "Pink" :extend t)) (((class color)) - (:foreground "cyan3" :background "yellow3" :weight bold)) + (:foreground "cyan3" :background "yellow3" :weight bold :extend t)) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer C." :group 'ediff-highlighting) @@ -870,15 +870,15 @@ this variable represents.") (defface ediff-current-diff-Ancestor '((((class color) (min-colors 88) (background light)) - :background "#cfdeee") + :background "#cfdeee" :extend t) (((class color) (min-colors 88) (background dark)) - :background "#004151") + :background "#004151" :extend t) (((class color) (min-colors 16) (background light)) - :background "#cfdeee") + :background "#cfdeee" :extend t) (((class color) (min-colors 16) (background dark)) - :background "#004151") + :background "#004151" :extend t) (((class color)) - (:foreground "black" :background "magenta3")) + (:foreground "black" :background "magenta3" :extend t)) (t (:inverse-video t))) "Face for highlighting the selected difference in buffer Ancestor." :group 'ediff-highlighting) @@ -993,14 +993,14 @@ this variable represents.") (defface ediff-even-diff-A `((((type pc)) - (:foreground "green3" :background "light grey")) + (:foreground "green3" :background "light grey" :extend t)) (((class color) (min-colors 88)) - (:background "light grey")) + (:background "light grey" :extend t)) (((class color) (min-colors 16)) - (:foreground "Black" :background "light grey")) + (:foreground "Black" :background "light grey" :extend t)) (((class color)) (:foreground "red3" :background "light grey" - :weight bold)) + :weight bold :extend t)) (t (:italic t :stipple ,stipple-pixmap))) "Face for highlighting even-numbered non-current differences in buffer A." :group 'ediff-highlighting) @@ -1015,11 +1015,11 @@ this variable represents.") (defface ediff-even-diff-B `((((class color) (min-colors 88)) - (:background "Grey")) + (:background "Grey" :extend t)) (((class color) (min-colors 16)) - (:foreground "White" :background "Grey")) + (:foreground "White" :background "Grey" :extend t)) (((class color)) - (:foreground "blue3" :background "Grey" :weight bold)) + (:foreground "blue3" :background "Grey" :weight bold :extend t)) (t (:italic t :stipple ,stipple-pixmap))) "Face for highlighting even-numbered non-current differences in buffer B." :group 'ediff-highlighting) @@ -1034,14 +1034,14 @@ this variable represents.") (defface ediff-even-diff-C `((((type pc)) - (:foreground "yellow3" :background "light grey")) + (:foreground "yellow3" :background "light grey" :extend t)) (((class color) (min-colors 88)) - (:background "light grey")) + (:background "light grey" :extend t)) (((class color) (min-colors 16)) - (:foreground "Black" :background "light grey")) + (:foreground "Black" :background "light grey" :extend t)) (((class color)) (:foreground "yellow3" :background "light grey" - :weight bold)) + :weight bold :extend t)) (t (:italic t :stipple ,stipple-pixmap))) "Face for highlighting even-numbered non-current differences in buffer C." :group 'ediff-highlighting) @@ -1056,14 +1056,14 @@ this variable represents.") (defface ediff-even-diff-Ancestor `((((type pc)) - (:foreground "cyan3" :background "light grey")) + (:foreground "cyan3" :background "light grey" :extend t)) (((class color) (min-colors 88)) - (:background "Grey")) + (:background "Grey" :extend t)) (((class color) (min-colors 16)) - (:foreground "White" :background "Grey")) + (:foreground "White" :background "Grey" :extend t)) (((class color)) (:foreground "cyan3" :background "light grey" - :weight bold)) + :weight bold :extend t)) (t (:italic t :stipple ,stipple-pixmap))) "Face for highlighting even-numbered non-current differences in the ancestor buffer." :group 'ediff-highlighting) @@ -1085,13 +1085,13 @@ this variable represents.") (defface ediff-odd-diff-A '((((type pc)) - (:foreground "green3" :background "gray40")) + (:foreground "green3" :background "gray40" :extend t)) (((class color) (min-colors 88)) - (:background "Grey")) + (:background "Grey" :extend t)) (((class color) (min-colors 16)) - (:foreground "White" :background "Grey")) + (:foreground "White" :background "Grey" :extend t)) (((class color)) - (:foreground "red3" :background "black" :weight bold)) + (:foreground "red3" :background "black" :weight bold :extend t)) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in buffer A." :group 'ediff-highlighting) @@ -1107,13 +1107,13 @@ this variable represents.") (defface ediff-odd-diff-B '((((type pc)) - (:foreground "White" :background "gray40")) + (:foreground "White" :background "gray40" :extend t)) (((class color) (min-colors 88)) - (:background "light grey")) + (:background "light grey" :extend t)) (((class color) (min-colors 16)) - (:foreground "Black" :background "light grey")) + (:foreground "Black" :background "light grey" :extend t)) (((class color)) - (:foreground "cyan3" :background "black" :weight bold)) + (:foreground "cyan3" :background "black" :weight bold :extend t)) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in buffer B." :group 'ediff-highlighting) @@ -1128,13 +1128,13 @@ this variable represents.") (defface ediff-odd-diff-C '((((type pc)) - (:foreground "yellow3" :background "gray40")) + (:foreground "yellow3" :background "gray40" :extend t)) (((class color) (min-colors 88)) - (:background "Grey")) + (:background "Grey" :extend t)) (((class color) (min-colors 16)) - (:foreground "White" :background "Grey")) + (:foreground "White" :background "Grey" :extend t)) (((class color)) - (:foreground "yellow3" :background "black" :weight bold)) + (:foreground "yellow3" :background "black" :weight bold :extend t)) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in buffer C." :group 'ediff-highlighting) @@ -1149,11 +1149,11 @@ this variable represents.") (defface ediff-odd-diff-Ancestor '((((class color) (min-colors 88)) - (:background "gray40")) + (:background "gray40" :extend t)) (((class color) (min-colors 16)) - (:foreground "cyan3" :background "gray40")) + (:foreground "cyan3" :background "gray40" :extend t)) (((class color)) - (:foreground "green3" :background "black" :weight bold)) + (:foreground "green3" :background "black" :weight bold :extend t)) (t (:italic t :stipple "gray1"))) "Face for highlighting odd-numbered non-current differences in the ancestor buffer." :group 'ediff-highlighting) |