[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 7e238e7: Add ':extend t' face attribute to diff fac
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] master 7e238e7: Add ':extend t' face attribute to diff faces (bug#37774) |
Date: |
Sat, 19 Oct 2019 16:51:11 -0400 (EDT) |
branch: master
commit 7e238e7d50872d43a137c1350cb3b293aea176c2
Author: Juri Linkov <address@hidden>
Commit: Juri Linkov <address@hidden>
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.
---
etc/NEWS | 6 ++--
lisp/faces.el | 18 +++++-----
lisp/vc/diff-mode.el | 20 +++++------
lisp/vc/ediff-init.el | 94 +++++++++++++++++++++++++-------------------------
lisp/vc/log-view.el | 4 +--
lisp/vc/smerge-mode.el | 16 ++++-----
6 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index fd46360..6ed3fd4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -391,9 +391,9 @@ to 'completion-styles' or 'completion-category-overrides'
to use it.
** New face attribute ':extend' to control face extension at EOL.
The new face attribute ':extend' controls whether to use the face for
displaying the empty space beyond end of line (EOL) till the edge of
-the window. By default, this attribute is non-nil only for 'region'
-and 'hl-line' faces; any other face that crosses end of line will not
-affect the display of the empty space at EOL.
+the window. By default, this attribute is non-nil only for 'region',
+'secondary-selection', 'hl-line' and diff faces; any other face that
+crosses end of line will not affect the display of the empty space at EOL.
** Connection-local variables
diff --git a/lisp/faces.el b/lisp/faces.el
index 36fc698..2779197 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2365,15 +2365,15 @@ If you set `term-file-prefix' to nil, this function
does nothing."
(defface secondary-selection
'((((class color) (min-colors 88) (background light))
- :background "yellow1")
+ :background "yellow1" :extend t)
(((class color) (min-colors 88) (background dark))
- :background "SkyBlue4")
+ :background "SkyBlue4" :extend t)
(((class color) (min-colors 16) (background light))
- :background "yellow")
+ :background "yellow" :extend t)
(((class color) (min-colors 16) (background dark))
- :background "SkyBlue4")
+ :background "SkyBlue4" :extend t)
(((class color) (min-colors 8))
- :background "cyan" :foreground "black")
+ :background "cyan" :foreground "black" :extend t)
(t :inverse-video t))
"Basic face for displaying the secondary selection."
:group 'basic-faces)
@@ -2419,9 +2419,9 @@ unwanted effects."
(defface line-number-major-tick
'((((class color grayscale) (background light))
- :foreground "grey55" :bold t)
+ :background "grey85" :bold t)
(((class color grayscale) (background dark))
- :foreground "grey75" :bold t)
+ :background "grey75" :bold t)
(t :inherit line-number))
"Face for highlighting \"major ticks\" (as in a ruler).
When `display-line-numbers-major-tick' is positive, highlight
@@ -2440,9 +2440,9 @@ unwanted effects."
(defface line-number-minor-tick
'((((class color grayscale) (background light))
- :foreground "grey65" :bold t)
+ :background "grey95" :bold t)
(((class color grayscale) (background dark))
- :foreground "grey55" :bold t)
+ :background "grey55" :bold t)
(t :inherit line-number))
"Face for highlighting \"minor ticks\" (as in a ruler).
When `display-line-numbers-minor-tick' is positive, highlight
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index c86f15c..dfac1cc 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -298,9 +298,9 @@ well."
(defface diff-header
'((((class color) (min-colors 88) (background light))
- :background "grey85")
+ :background "grey85" :extend t)
(((class color) (min-colors 88) (background dark))
- :background "grey45")
+ :background "grey45" :extend t)
(((class color))
:foreground "blue1" :weight bold)
(t :weight bold))
@@ -308,9 +308,9 @@ well."
(defface diff-file-header
'((((class color) (min-colors 88) (background light))
- :background "grey75" :weight bold)
+ :background "grey75" :weight bold :extend t)
(((class color) (min-colors 88) (background dark))
- :background "grey60" :weight bold)
+ :background "grey60" :weight bold :extend t)
(((class color))
:foreground "cyan" :weight bold)
(t :weight bold)) ; :height 1.3
@@ -328,11 +328,11 @@ well."
'((default
:inherit diff-changed)
(((class color) (min-colors 257) (background light))
- :background "#ffeeee")
+ :background "#ffeeee" :extend t)
(((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))
:foreground "red"))
"`diff-mode' face used to highlight removed lines.")
@@ -341,11 +341,11 @@ well."
'((default
:inherit diff-changed)
(((class color) (min-colors 257) (background light))
- :background "#eeffee")
+ :background "#eeffee" :extend t)
(((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))
:foreground "green"))
"`diff-mode' face used to highlight added lines.")
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 9e4d08d..ca7f4eb 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)
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 3389264..054c2b9 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -196,14 +196,14 @@ If it is nil, `log-view-toggle-entry-display' does
nothing.")
(defface log-view-file
'((((class color) (background light))
- (:background "grey70" :weight bold))
+ (:background "grey70" :weight bold :extend t))
(t (:weight bold)))
"Face for the file header line in `log-view-mode'."
:group 'log-view)
(defface log-view-message
'((((class color) (background light))
- (:background "grey85"))
+ (:background "grey85" :extend t))
(t (:weight bold)))
"Face for the message header line in `log-view-mode'."
:group 'log-view)
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index f032b08..6d2d3f8 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -77,9 +77,9 @@ Used in `smerge-diff-base-upper' and related functions."
(defface smerge-upper
'((((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))
:foreground "red"))
"Face for the `upper' version of a conflict.")
@@ -88,9 +88,9 @@ Used in `smerge-diff-base-upper' and related functions."
(defface smerge-lower
'((((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))
:foreground "green"))
"Face for the `lower' version of a conflict.")
@@ -99,9 +99,9 @@ Used in `smerge-diff-base-upper' and related functions."
(defface smerge-base
'((((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))
:foreground "yellow"))
"Face for the base code.")
@@ -109,9 +109,9 @@ Used in `smerge-diff-base-upper' and related functions."
(defface smerge-markers
'((((background light))
- (:background "grey85"))
+ (:background "grey85" :extend t))
(((background dark))
- (:background "grey30")))
+ (:background "grey30" :extend t)))
"Face for the conflict markers.")
(defvar smerge-markers-face 'smerge-markers)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 7e238e7: Add ':extend t' face attribute to diff faces (bug#37774),
Juri Linkov <=