Commit 64687872 authored by Eli Zaretskii's avatar Eli Zaretskii

Add ':extend' attribute to faces and themes

* etc/themes/wombat-theme.el:
* etc/themes/wheatgrass-theme.el:
* etc/themes/tsdh-light-theme.el:
* etc/themes/tsdh-dark-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/misterioso-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/light-blue-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/dichromacy-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/adwaita-theme.el: Add ':extend' attribute to all
faces that are by default defined with it.

* lisp/vc/smerge-mode.el (smerge-upper, smerge-lower)
(smerge-base):
* lisp/vc/log-view.el (log-view-file, log-view-message):
* 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):
* lisp/vc/diff-mode.el (diff-header, diff-file-header)
(diff-removed, diff-added): Make sure all definitions of faces
have the same value of the ':extend' property, otherwise
customizing background color or underline etc. attributes of
these faces on some displays will produce effects different
from other displays.
parent abd3dd3a
Pipeline #4206 failed with stage
in 66 minutes and 9 seconds
......@@ -39,7 +39,7 @@ default look of the Gnome 3 desktop.")
`(header-line ((,class (:foreground "#CCCCCC" :background "black"))))
`(minibuffer-prompt ((,class (:foreground "#0084C8" :bold t))))
`(region ((,class (:foreground unspecified :background "#C2D5E9"))))
`(region ((,class (:foreground unspecified :background "#C2D5E9" :extend t))))
`(dired-header ((,class (:bold t :foreground "#0084C8"))))
`(widget-button ((,class (:bold t :foreground "#0084C8"))))
......@@ -96,7 +96,7 @@ default look of the Gnome 3 desktop.")
`(gnus-cite-1 ((,class (:foreground "#00578E"))))
`(gnus-cite-2 ((,class (:foreground "#0084C8"))))
`(diff-added ((,class (:bold t :foreground "#4E9A06"))))
`(diff-removed ((,class (:bold t :foreground "#F5666D"))))))
`(diff-added ((,class (:bold t :foreground "#4E9A06" :extend t))))
`(diff-removed ((,class (:bold t :foreground "#F5666D" :extend t))))))
;;; adwaita-theme.el ends here
......@@ -43,9 +43,9 @@
;; `(diff-added ((,class (nil))))
;; `(diff-changed ((,class (nil))))
`(diff-context ((,class (:foreground "seashell4"))))
`(diff-file-header ((,class (:background "grey60"))))
`(diff-file-header ((,class (:background "grey60" :extend t))))
`(diff-function ((,class (:inherit diff-header))))
`(diff-header ((,class (:background "grey45"))))
`(diff-header ((,class (:background "grey45" :extend t))))
`(diff-hunk-header ((,class (:inherit diff-header))))
`(diff-index ((,class (:inherit diff-file-header))))
`(diff-indicator-added ((,class (:foreground "white" :background "darkolivegreen"))))
......@@ -54,12 +54,12 @@
`(diff-refine-change ((,class (:background "skyblue4"))))
;; `(diff-removed ((,class (nil))))
`(dired-marked ((,class (:background "dodgerblue3" :foreground "white"))))
`(ediff-current-diff-A ((,class (:background "green4" :foreground "white"))))
`(ediff-current-diff-B ((,class (:background "darkorange3" :foreground "white"))))
`(ediff-even-diff-B ((,class (:background "Grey50" :foreground "White"))))
`(ediff-current-diff-A ((,class (:background "green4" :foreground "white" :extend t))))
`(ediff-current-diff-B ((,class (:background "darkorange3" :foreground "white" :extend t))))
`(ediff-even-diff-B ((,class (:background "Grey50" :foreground "White" :extend t))))
`(ediff-fine-diff-A ((,class (:background "skyblue4" :foreground "white"))))
`(ediff-fine-diff-B ((,class (:background "cyan4" :foreground "white"))))
`(ediff-odd-diff-A ((,class (:background "Grey50" :foreground "White"))))
`(ediff-odd-diff-A ((,class (:background "Grey50" :foreground "White" :extend t))))
`(error ((,class (:foreground "red"))))
`(flymake-errline ((,class (:background nil :underline "red"))))
`(flymake-warnline ((,class (:background nil :underline "magenta3"))))
......@@ -102,7 +102,7 @@
`(outline-4 ((,class (:foreground "turquoise2"))))
`(outline-5 ((,class (:foreground "aquamarine1"))))
`(primary-selection ((,class (:background "blue3"))))
`(region ((,class (:background "#103050"))))
`(region ((,class (:background "#103050" :extend t))))
`(show-paren-match-face ((,class (:background "dodgerblue1" :foreground "white"))))
`(show-paren-mismatch-face ((,class (:background "red1" :foreground "white"))))
`(success ((,class (:foreground "SeaGreen2"))))
......
......@@ -46,8 +46,8 @@ Ansi-Color faces are included.")
;; Highlighting faces
`(fringe ((,class (:background "#f7f7f7"))))
`(highlight ((,class (:foreground ,blue :background "#e5e5e5"))))
`(region ((,class (:foreground unspecified :background ,yellow))))
`(secondary-selection ((,class (:background "#e5e5e5"))))
`(region ((,class (:foreground unspecified :background ,yellow :extend t))))
`(secondary-selection ((,class (:background "#e5e5e5" :extend t))))
`(isearch ((,class (:foreground "white" :background ,vermillion))))
`(lazy-highlight ((,class (:foreground "white" :background ,redpurple))))
`(trailing-whitespace ((,class (:background ,vermillion))))
......
......@@ -48,12 +48,12 @@ Semantic, and Ansi-Color faces are included -- and much more...")
(code-block '(:foreground "#000088" :background "#FFFFE0"))
(code-inline '(:foreground "#006400" :background "#FDFFF7"))
(column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#E6AD4F" :background "#FFF2DE"))
(diff-added '(:foreground "#008000" :background "#DDFFDD"))
(diff-added '(:foreground "#008000" :background "#DDFFDD" :extend t))
(diff-changed '(:foreground "#0000FF" :background "#DDDDFF"))
(diff-header '(:foreground "#800000" :background "#FFFFAF"))
(diff-header '(:foreground "#800000" :background "#FFFFAF" :extend t))
(diff-hunk-header '(:foreground "#990099" :background "#FFEEFF"))
(diff-none '(:foreground "gray33"))
(diff-removed '(:foreground "#A60000" :background "#FFDDDD"))
(diff-removed '(:foreground "#A60000" :background "#FFDDDD" :extend t))
(directory '(:weight bold :foreground "blue" :background "#FFFFD2"))
(highlight-line '(:background "#FFFFD7")) ; #F5F5F5
(highlight-line-gnus '(:background "#DAEAFC")) ; defined in `gnus-leuven.el'
......@@ -76,7 +76,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
(ol8 '(:height 1.0 :weight bold :slant italic :foreground "#FD8008"))
(paren-matched '(:background "#99CCFF"))
(paren-unmatched '(:underline "red" :foreground nil :background "#FFDCDC"))
(region '(:background "#ABDFFA"))
(region '(:background "#ABDFFA" :extend t))
(shadow '(:foreground "#7F7F7F"))
(string '(:foreground "#008000")) ; or #D0372D
(subject '(:family "Sans Serif" :weight bold :foreground "black"))
......@@ -243,15 +243,15 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(smerge-refined-change ((,class (:background "#AAAAFF"))))
;; Ediff
`(ediff-current-diff-A ((,class (:foreground "gray33" :background "#FFDDDD"))))
`(ediff-current-diff-B ((,class (:foreground "gray33" :background "#DDFFDD"))))
`(ediff-current-diff-C ((,class (:foreground "black" :background "cyan"))))
`(ediff-even-diff-A ((,class (:foreground "black" :background "light grey"))))
`(ediff-even-diff-B ((,class (:foreground "black" :background "light grey"))))
`(ediff-current-diff-A ((,class (:foreground "gray33" :background "#FFDDDD" :extend t))))
`(ediff-current-diff-B ((,class (:foreground "gray33" :background "#DDFFDD" :extend t))))
`(ediff-current-diff-C ((,class (:foreground "black" :background "cyan" :extend t))))
`(ediff-even-diff-A ((,class (:foreground "black" :background "light grey" :extend t))))
`(ediff-even-diff-B ((,class (:foreground "black" :background "light grey" :extend t))))
`(ediff-fine-diff-A ((,class (:foreground "#A60000" :background "#FFAAAA"))))
`(ediff-fine-diff-B ((,class (:foreground "#008000" :background "#55FF55"))))
`(ediff-odd-diff-A ((,class (:foreground "black" :background "light grey"))))
`(ediff-odd-diff-B ((,class (:foreground "black" :background "light grey"))))
`(ediff-odd-diff-A ((,class (:foreground "black" :background "light grey" :extend t))))
`(ediff-odd-diff-B ((,class (:foreground "black" :background "light grey" :extend t))))
;; Flyspell
;; (when (version< emacs-version "24.XXX")
......@@ -462,7 +462,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(info-xref-visited ((,class (:underline t :foreground "magenta4")))) ; previously visited cross-references
`(light-symbol-face ((,class (:background "#FFFFA0"))))
`(linum ((,class (:inherit (default shadow) :foreground "#9A9A9A" :background "#EDEDED"))))
`(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
`(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5" :extend t))))
`(lui-button-face ((,class ,link)))
`(lui-highlight-face ((,class (:box '(:line-width 1 :color "#CC0000") :foreground "#CC0000" :background "#FFFF88")))) ; my nickname
`(lui-time-stamp-face ((,class (:foreground "purple"))))
......
......@@ -36,8 +36,8 @@
`(fringe ((,class (:background "gray85"))))
;; Highlighting faces
`(highlight ((,class (:background "cyan"))))
`(region ((,class (:background "MediumAquamarine"))))
`(secondary-selection ((,class (:background "white" :foreground "black"))))
`(region ((,class (:background "MediumAquamarine" :extend t))))
`(secondary-selection ((,class (:background "white" :foreground "black" :extend t))))
`(isearch ((,class (:background "green" :foreground "Black"))))
`(lazy-highlight ((,class (:background "dark turquoise"))))
`(query-replace ((,class (:inherit isearch :background "white" :foreground "black"))))
......
......@@ -435,11 +435,11 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(diary-button ((t (:background "lightgrey" :foreground "black" :box (:line-width 2 :style released-button)))))
'(diary-face ((t (:foreground "IndianRed"))))
'(diary-time ((t (:foreground "LightGoldenrod"))))
'(diff-added ((t (:foreground "Green"))))
'(diff-added ((t (:foreground "Green" :extend t))))
'(diff-added-face ((t (:foreground "Green"))))
'(diff-changed-face ((t (:foreground "Khaki"))))
'(diff-context-face ((t (:foreground "grey70"))))
'(diff-file-header ((t (:bold t :background "grey20" :foreground "ivory1" :weight bold))))
'(diff-file-header ((t (:bold t :background "grey20" :foreground "ivory1" :weight bold :extend t))))
'(diff-file-header-face ((t (:bold t :background "grey20" :foreground "ivory1" :weight bold))))
'(diff-function-face ((t (:foreground "SpringGreen1"))))
'(diff-header-face ((t (:background "SlateBlue4"))))
......@@ -448,7 +448,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(diff-index-face ((t (:bold t :weight bold :background "SteelBlue4" :foreground "linen" ))))
'(diff-nonexistent ((t (:bold t :weight bold :background "Black" :foreground "Wheat1"))))
'(diff-nonexistent-face ((t (:bold t :weight bold :background "Black" :foreground "Wheat1"))))
'(diff-removed ((t (:foreground "salmon1"))))
'(diff-removed ((t (:foreground "salmon1" :extend t))))
'(diff-removed-face ((t (:foreground "salmon1"))))
'(diff-refine-change-face ((t (:background "MidnightBlue"))))
'(diff-refine-change ((t (:background "MidnightBlue"))))
......@@ -511,7 +511,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(header-line ((t (:box (:line-width -1 :color "grey20" :style released-button) :background "grey20" :foreground "grey90" :height 0.9))))
'(help-argument-name ((t (:italic t :slant italic))))
'(highlight ((t (:background "gray10" :foreground "Old Lace"))))
'(hl-line ((t (:background "grey10" :foreground "Old Lace"))))
'(hl-line ((t (:background "grey10" :foreground "Old Lace" :extend t))))
'(gnus-mouse-face ((t (:background "darkseagreen2" :foreground "blue"))))
'(erc-button-mouse-face ((t (:background "darkseagreen2" :foreground "blue"))))
'(align-highlight-change-face ((t (:background "darkseagreen2" :foreground "blue"))))
......@@ -601,7 +601,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(paren-mismatch-face ((t (:bold t :background "white" :foreground "red"))))
'(paren-no-match-face ((t (:bold t :background "white" :foreground "red"))))
'(query-replace ((t (:foreground "brown4" :background "palevioletred2"))))
'(region ((t (:background "blue3"))))
'(region ((t (:background "blue3" :extend t))))
'(realgud-overlay-arrow1 ((t (:foreground "medium sea green"))))
'(realgud-overlay-arrow2 ((t (:foreground "white"))))
'(realgud-overlay-arrow3 ((t (:foreground "indian red"))))
......@@ -613,7 +613,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(realgud-line-number ((t (:foreground "yellow"))))
'(realgud-backtrace-number ((t (:foreground "yellow" :weight bold))))
'(scroll-bar ((t (:background "grey75" :foreground "WhiteSmoke"))))
'(secondary-selection ((t (:background "SkyBlue4"))))
'(secondary-selection ((t (:background "SkyBlue4" :extend t))))
'(semantic-dirty-token-face ((t (:background "lightyellow"))))
'(semantic-highlight-edits-face ((t (:background "gray20"))))
'(semantic-unmatched-syntax-face ((t (:underline "red"))))
......@@ -631,10 +631,10 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(show-paren-match ((t (:background "steelblue3"))))
'(show-paren-match-face ((t (:background "steelblue3"))))
'(show-paren-mismatch ((t (:background "purple" :foreground "white"))))
'(smerge-base ((t (:foreground "orange"))))
'(smerge-markers ((t (:background "grey30"))))
'(smerge-mine ((t (:foreground "cyan"))))
'(smerge-other ((t (:foreground "lightgreen"))))
'(smerge-base ((t (:foreground "orange" :extend t))))
'(smerge-markers ((t (:background "grey30" :extend t))))
'(smerge-mine ((t (:foreground "cyan" :extend t))))
'(smerge-other ((t (:foreground "lightgreen" :extend t))))
'(smerge-refined-change ((t (:background "blue4"))))
'(speedbar-button-face ((t (:foreground "green3"))))
'(speedbar-directory-face ((t (:foreground "light blue"))))
......
......@@ -37,7 +37,7 @@
;; Highlighting faces
`(fringe ((,class (:background "#2e3748"))))
`(highlight ((,class (:background "#338f86" :foreground "#e1e1e0"))))
`(region ((,class (:background "#2d4948" :foreground "#e1e1e0"))))
`(region ((,class (:background "#2d4948" :foreground "#e1e1e0" :extend t))))
`(isearch ((,class (:background "#fcffad" :foreground "#000000"))))
`(lazy-highlight ((,class (:background "#338f86"))))
`(trailing-whitespace ((,class (:background "#ff4242"))))
......
......@@ -61,8 +61,8 @@ Semantic, and Ansi-Color faces are included.")
;; Highlighting faces
`(fringe ((,class (:background ,alum-7))))
`(highlight ((,class (:foreground ,alum-6 :background "#c0c000"))))
`(region ((,class (:background ,alum-5))))
`(secondary-selection ((,class (:background ,blue-3))))
`(region ((,class (:background ,alum-5 :extend t))))
`(secondary-selection ((,class (:background ,blue-3 :extend t))))
`(isearch ((,class (:foreground ,alum-1 :background ,orange-3))))
`(lazy-highlight ((,class (:background ,choc-3))))
`(trailing-whitespace ((,class (:background ,red-3))))
......@@ -130,14 +130,14 @@ Semantic, and Ansi-Color faces are included.")
;; SMerge faces
`(smerge-refined-change ((,class (:background ,blue-3))))
;; Ediff faces
`(ediff-current-diff-A ((,class (:background ,alum-5))))
`(ediff-current-diff-A ((,class (:background ,alum-5 :extend t))))
`(ediff-fine-diff-A ((,class (:background ,blue-3))))
`(ediff-even-diff-A ((,class (:background ,alum-5.5))))
`(ediff-odd-diff-A ((,class (:background ,alum-5.5))))
`(ediff-current-diff-B ((,class (:background ,alum-5))))
`(ediff-even-diff-A ((,class (:background ,alum-5.5 :extend t))))
`(ediff-odd-diff-A ((,class (:background ,alum-5.5 :extend t))))
`(ediff-current-diff-B ((,class (:background ,alum-5 :extend t))))
`(ediff-fine-diff-B ((,class (:background ,choc-3))))
`(ediff-even-diff-B ((,class (:background ,alum-5.5))))
`(ediff-odd-diff-B ((,class (:background ,alum-5.5))))
`(ediff-even-diff-B ((,class (:background ,alum-5.5 :extend t))))
`(ediff-odd-diff-B ((,class (:background ,alum-5.5 :extend t))))
;; Flyspell faces
`(flyspell-duplicate ((,class (:underline ,orange-1))))
`(flyspell-incorrect ((,class (:underline ,red-1))))
......
......@@ -53,8 +53,8 @@ Semantic, and Ansi-Color faces are included.")
;; Highlighting faces
`(fringe ((,class (:background ,alum-2))))
`(highlight ((,class (:background ,alum-3))))
`(region ((,class (:background ,alum-3))))
`(secondary-selection ((,class (:background ,blue-0))))
`(region ((,class (:background ,alum-3 :extend t))))
`(secondary-selection ((,class (:background ,blue-0 :extend t))))
`(isearch ((,class (:foreground "#ffffff" :background ,orange-3))))
`(lazy-highlight ((,class (:background ,choc-1))))
`(trailing-whitespace ((,class (:background ,red-1))))
......@@ -117,9 +117,9 @@ Semantic, and Ansi-Color faces are included.")
;; SMerge
`(smerge-refined-change ((,class (:background ,plum-1))))
;; Ediff
`(ediff-current-diff-A ((,class (:background ,blue-1))))
`(ediff-current-diff-A ((,class (:background ,blue-1 :extend t))))
`(ediff-fine-diff-A ((,class (:background ,plum-1))))
`(ediff-current-diff-B ((,class (:background ,butter-1))))
`(ediff-current-diff-B ((,class (:background ,butter-1 :extend t))))
`(ediff-fine-diff-B ((,class (:background ,orange-1))))
;; Flyspell
`(flyspell-duplicate ((,class (:underline ,orange-1))))
......
......@@ -26,12 +26,12 @@
'tsdh-dark
'(aw-leading-char-face ((t (:background "gray30" :foreground "red" :weight bold))))
'(default ((t (:background "gray20" :foreground "white smoke"))))
'(diff-added ((t (:inherit diff-changed :background "dark green"))) t)
'(diff-added ((t (:inherit diff-changed :background "dark green" :extend t))) t)
'(diff-changed ((t (:background "midnight blue"))) t)
'(diff-indicator-added ((t (:inherit diff-indicator-changed))) t)
'(diff-indicator-changed ((t (:weight bold))) t)
'(diff-indicator-removed ((t (:inherit diff-indicator-changed))) t)
'(diff-removed ((t (:inherit diff-changed :background "dark red"))) t)
'(diff-removed ((t (:inherit diff-changed :background "dark red" :extend t))) t)
'(dired-directory ((t (:foreground "DodgerBlue" :weight bold))))
'(error ((t (:foreground "deep pink" :weight bold))))
'(eshell-prompt ((t (:inherit font-lock-function-name-face :weight bold))))
......@@ -69,7 +69,7 @@
'(header-line ((t (:inverse-video t :box (:line-width -1 :color "red" :style released-button)))))
'(helm-header ((t (:background "DeepSkyBlue4" :weight bold))))
'(highlight ((t (:background "sea green"))))
'(hl-line ((t (:background "grey25"))))
'(hl-line ((t (:background "grey25" :extend t))))
'(hl-paren-face ((t (:weight bold))) t)
'(icomplete-first-match ((t (:foreground "deep sky blue" :weight bold))))
'(ido-first-match ((t (:foreground "turquoise" :weight bold))))
......@@ -132,9 +132,9 @@
'(rcirc-other-nick ((t (:foreground "dodger blue"))) t)
'(rcirc-track-keyword ((t (:foreground "DodgerBlue" :weight bold))) t)
'(rcirc-track-nick ((t (:background "yellow" :foreground "DodgerBlue" :weight bold))) t)
'(region ((t (:background "SeaGreen4"))))
'(region ((t (:background "SeaGreen4" :extend t))))
'(scroll-bar ((t (:background "gray20" :foreground "dark turquoise"))))
'(secondary-selection ((t (:background "#333366" :foreground "#f6f3e8"))))
'(secondary-selection ((t (:background "#333366" :foreground "#f6f3e8" :extend t))))
'(show-paren-match ((t (:background "DeepSkyBlue4"))))
'(show-paren-mismatch ((t (:background "dark magenta"))))
'(swiper-match-face-1 ((t (:background "gray35"))))
......
......@@ -29,12 +29,12 @@ Used and created by Tassilo Horn.")
'(Info-quoted ((t (:underline "gray40" :weight bold))))
'(aw-leading-char-face ((t (:background "red" :foreground "white" :weight bold))))
'(default ((t (:background "white" :foreground "black"))))
'(diff-added ((t (:inherit diff-changed :background "light green"))))
'(diff-added ((t (:inherit diff-changed :background "light green" :extend t))))
'(diff-changed ((t (:background "light steel blue"))))
'(diff-indicator-added ((t (:inherit diff-indicator-changed))))
'(diff-indicator-changed ((t (:weight bold))))
'(diff-indicator-removed ((t (:inherit diff-indicator-changed))))
'(diff-removed ((t (:inherit diff-changed :background "sandy brown"))))
'(diff-removed ((t (:inherit diff-changed :background "sandy brown" :extend t))))
'(dired-directory ((t (:inherit font-lock-function-name-face :weight bold))))
'(font-lock-builtin-face ((t (:foreground "#e44649"))))
'(font-lock-comment-delimiter-face ((t (:inherit font-lock-comment-face :weight bold))))
......@@ -62,7 +62,7 @@ Used and created by Tassilo Horn.")
'(gnus-group-news-2-empty ((t (:foreground "tomato3"))))
'(gnus-group-news-3 ((t (:inherit gnus-group-news-3-empty :weight bold))))
'(gnus-group-news-3-empty ((t (:foreground "tomato2")))) '(header-line ((t (:inherit mode-line :inverse-video t))))
'(hl-line ((t (:background "#f0f0f1"))))
'(hl-line ((t (:background "#f0f0f1" :extend t))))
'(hl-paren-face ((t (:weight bold))) t)
'(minibuffer-prompt ((t (:foreground "#0184bc" :box (:line-width -1 :style released-button) :weight bold))))
'(mode-line ((t (:background "#f0f0f1" :box (:line-width 1 :color "#383a42")))))
......
......@@ -40,8 +40,8 @@ of green, brown, and blue.")
`(compilation-info ((,class (:foreground "ForestGreen"))))
;; Highlighting faces
`(highlight ((,class (:foreground "white" :background "dark green"))))
`(region ((,class (:foreground "white" :background "dark green"))))
`(secondary-selection ((,class (:background "dark slate gray"))))
`(region ((,class (:foreground "white" :background "dark green" :extend t))))
`(secondary-selection ((,class (:background "dark slate gray" :extend t))))
`(isearch ((,class (:foreground "white" :background "dark goldenrod"))))
`(lazy-highlight ((,class (:background "gray25"))))
;; Font lock faces
......
......@@ -36,8 +36,8 @@ are included.")
`(fringe ((,class (:background "#303030"))))
`(highlight ((,class (:background "#454545" :foreground "#ffffff"
:underline t))))
`(region ((,class (:background "#444444" :foreground "#f6f3e8"))))
`(secondary-selection ((,class (:background "#333366" :foreground "#f6f3e8"))))
`(region ((,class (:background "#444444" :foreground "#f6f3e8" :extend t))))
`(secondary-selection ((,class (:background "#333366" :foreground "#f6f3e8" :extend t))))
`(isearch ((,class (:background "#343434" :foreground "#857b6f"))))
`(lazy-highlight ((,class (:background "#384048" :foreground "#a0a8b0"))))
;; Mode line faces
......
......@@ -302,8 +302,8 @@ well."
(((class color) (min-colors 88) (background dark))
:background "grey45" :extend t)
(((class color))
:foreground "blue1" :weight bold)
(t :weight bold))
:foreground "blue1" :weight bold :extend t)
(t :weight bold :extend t))
"`diff-mode' face inherited by hunk and index header faces.")
(defface diff-file-header
......@@ -312,8 +312,8 @@ well."
(((class color) (min-colors 88) (background dark))
:background "grey60" :weight bold :extend t)
(((class color))
:foreground "cyan" :weight bold)
(t :weight bold)) ; :height 1.3
:foreground "cyan" :weight bold :extend t)
(t :weight bold :extend t)) ; :height 1.3
"`diff-mode' face used to highlight file header lines.")
(defface diff-index
......@@ -334,7 +334,7 @@ well."
(((class color) (min-colors 88) (background dark))
:background "#553333" :extend t)
(((class color))
:foreground "red"))
:foreground "red" :extend t))
"`diff-mode' face used to highlight removed lines.")
(defface diff-added
......@@ -347,7 +347,7 @@ well."
(((class color) (min-colors 88) (background dark))
:background "#335533" :extend t)
(((class color))
:foreground "green"))
:foreground "green" :extend t))
"`diff-mode' face used to highlight added lines.")
(defface diff-changed
......
......@@ -813,7 +813,7 @@ to temp files in buffer jobs and when Ediff needs to find fine differences."
(:foreground "firebrick" :background "pale green" :extend t))
(((class color))
(:foreground "blue3" :background "yellow3" :extend t))
(t (:inverse-video t)))
(t (:inverse-video t :extend t)))
"Face for highlighting the selected difference in buffer A."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......@@ -835,7 +835,7 @@ this variable represents.")
(((class color))
(:foreground "magenta3" :background "yellow3"
:weight bold :extend t))
(t (:inverse-video t)))
(t (:inverse-video t :extend t)))
"Face for highlighting the selected difference in buffer B."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......@@ -856,7 +856,7 @@ this variable represents.")
(:foreground "Navy" :background "Pink" :extend t))
(((class color))
(:foreground "cyan3" :background "yellow3" :weight bold :extend t))
(t (:inverse-video t)))
(t (:inverse-video t :extend t)))
"Face for highlighting the selected difference in buffer C."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......@@ -879,7 +879,7 @@ this variable represents.")
:background "#004151" :extend t)
(((class color))
(:foreground "black" :background "magenta3" :extend t))
(t (:inverse-video t)))
(t (:inverse-video t :extend t)))
"Face for highlighting the selected difference in buffer Ancestor."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......@@ -1001,7 +1001,7 @@ this variable represents.")
(((class color))
(:foreground "red3" :background "light grey"
:weight bold :extend t))
(t (:italic t :stipple ,stipple-pixmap)))
(t (:italic t :stipple ,stipple-pixmap :extend t)))
"Face for highlighting even-numbered non-current differences in buffer A."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......@@ -1020,7 +1020,7 @@ this variable represents.")
(:foreground "White" :background "Grey" :extend t))
(((class color))
(:foreground "blue3" :background "Grey" :weight bold :extend t))
(t (:italic t :stipple ,stipple-pixmap)))
(t (:italic t :stipple ,stipple-pixmap :extend t)))
"Face for highlighting even-numbered non-current differences in buffer B."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......@@ -1042,7 +1042,7 @@ this variable represents.")
(((class color))
(:foreground "yellow3" :background "light grey"
:weight bold :extend t))
(t (:italic t :stipple ,stipple-pixmap)))
(t (:italic t :stipple ,stipple-pixmap :extend t)))
"Face for highlighting even-numbered non-current differences in buffer C."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......@@ -1064,7 +1064,7 @@ this variable represents.")
(((class color))
(:foreground "cyan3" :background "light grey"
:weight bold :extend t))
(t (:italic t :stipple ,stipple-pixmap)))
(t (:italic t :stipple ,stipple-pixmap :extend t)))
"Face for highlighting even-numbered non-current differences in the ancestor buffer."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......@@ -1092,7 +1092,7 @@ this variable represents.")
(:foreground "White" :background "Grey" :extend t))
(((class color))
(:foreground "red3" :background "black" :weight bold :extend t))
(t (:italic t :stipple "gray1")))
(t (:italic t :stipple "gray1" :extend t)))
"Face for highlighting odd-numbered non-current differences in buffer A."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......@@ -1114,7 +1114,7 @@ this variable represents.")
(:foreground "Black" :background "light grey" :extend t))
(((class color))
(:foreground "cyan3" :background "black" :weight bold :extend t))
(t (:italic t :stipple "gray1")))
(t (:italic t :stipple "gray1" :extend t)))
"Face for highlighting odd-numbered non-current differences in buffer B."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......@@ -1135,7 +1135,7 @@ this variable represents.")
(:foreground "White" :background "Grey" :extend t))
(((class color))
(:foreground "yellow3" :background "black" :weight bold :extend t))
(t (:italic t :stipple "gray1")))
(t (:italic t :stipple "gray1" :extend t)))
"Face for highlighting odd-numbered non-current differences in buffer C."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......@@ -1154,7 +1154,7 @@ this variable represents.")
(:foreground "cyan3" :background "gray40" :extend t))
(((class color))
(:foreground "green3" :background "black" :weight bold :extend t))
(t (:italic t :stipple "gray1")))
(t (:italic t :stipple "gray1" :extend t)))
"Face for highlighting odd-numbered non-current differences in the ancestor buffer."
:group 'ediff-highlighting)
;; An internal variable. Ediff takes the face from here. When unhighlighting,
......
......@@ -197,14 +197,14 @@ If it is nil, `log-view-toggle-entry-display' does nothing.")
(defface log-view-file
'((((class color) (background light))
(:background "grey70" :weight bold :extend t))
(t (:weight bold)))
(t (:weight bold :extend t)))
"Face for the file header line in `log-view-mode'."
:group 'log-view)
(defface log-view-message
'((((class color) (background light))
(:background "grey85" :extend t))
(t (:weight bold)))
(t (:weight bold :extend t)))
"Face for the message header line in `log-view-mode'."
:group 'log-view)
......
......@@ -81,7 +81,7 @@ Used in `smerge-diff-base-upper' and related functions."
(((class color) (min-colors 88) (background dark))
:background "#553333" :extend t)
(((class color))
:foreground "red"))
:foreground "red" :extend))
"Face for the `upper' version of a conflict.")
(define-obsolete-face-alias 'smerge-mine 'smerge-upper "26.1")
(defvar smerge-upper-face 'smerge-upper)
......@@ -92,7 +92,7 @@ Used in `smerge-diff-base-upper' and related functions."
(((class color) (min-colors 88) (background dark))
:background "#335533" :extend t)
(((class color))
:foreground "green"))
:foreground "green" :extend))
"Face for the `lower' version of a conflict.")
(define-obsolete-face-alias 'smerge-other 'smerge-lower "26.1")
(defvar smerge-lower-face 'smerge-lower)
......@@ -103,7 +103,7 @@ Used in `smerge-diff-base-upper' and related functions."
(((class color) (min-colors 88) (background dark))
:background "#888833" :extend t)
(((class color))
:foreground "yellow"))
:foreground "yellow" :extend t))
"Face for the base code.")
(defvar smerge-base-face 'smerge-base)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment