aboutsummaryrefslogtreecommitdiffstats
path: root/etc/themes
diff options
context:
space:
mode:
authorDmitry Gutov2019-12-10 02:11:15 +0200
committerDmitry Gutov2019-12-10 02:16:44 +0200
commit58fb4c3e68a4a42ad491d0fa2c084e5c39942e2b (patch)
treeefe7a9e6a1b8f76cee65ecd59eb00d9d1e0d1838 /etc/themes
parentd8d537e17349c02d981eabd92c78f60f73354798 (diff)
downloademacs-58fb4c3e68a4a42ad491d0fa2c084e5c39942e2b.tar.gz
emacs-58fb4c3e68a4a42ad491d0fa2c084e5c39942e2b.zip
Make ':extend' inherited from default spec unless overridden
* lisp/faces.el (face-spec-recalc): Handle the :extend attribute specially and always inherit it from the default spec unless overwritten in a theme (bug#37774). * test/lisp/faces-tests.el (faces--test-data-dir): New variable. (faces--test-extend-with-themes): Use test themes instead of ones from etc/themes. Update expected values. * test/data/themes/faces-test-dark-theme.el: New file. * test/data/themes/faces-test-light-theme.el: New file. * doc/lispref/display.texi (Face Attributes): Update the description of ':extend'. * etc/NEWS: Update the entry for ':extend'. * etc/themes/adwaita-theme.el: * etc/themes/deeper-blue-theme.el: * etc/themes/dichromacy-theme.el: * etc/themes/leuven-theme.el: * etc/themes/light-blue-theme.el: * etc/themes/manoj-dark-theme.el: * etc/themes/misterioso-theme.el: * etc/themes/tango-dark-theme.el: * etc/themes/tango-theme.el: * etc/themes/tsdh-dark-theme.el: * etc/themes/tsdh-light-theme.el: * etc/themes/wheatgrass-theme.el: * etc/themes/wombat-theme.el: Remove the now-redundant ':extend' attribute in all the themes.
Diffstat (limited to 'etc/themes')
-rw-r--r--etc/themes/adwaita-theme.el6
-rw-r--r--etc/themes/deeper-blue-theme.el14
-rw-r--r--etc/themes/dichromacy-theme.el4
-rw-r--r--etc/themes/leuven-theme.el24
-rw-r--r--etc/themes/light-blue-theme.el4
-rw-r--r--etc/themes/manoj-dark-theme.el20
-rw-r--r--etc/themes/misterioso-theme.el2
-rw-r--r--etc/themes/tango-dark-theme.el16
-rw-r--r--etc/themes/tango-theme.el8
-rw-r--r--etc/themes/tsdh-dark-theme.el10
-rw-r--r--etc/themes/tsdh-light-theme.el6
-rw-r--r--etc/themes/wheatgrass-theme.el4
-rw-r--r--etc/themes/wombat-theme.el4
13 files changed, 61 insertions, 61 deletions
diff --git a/etc/themes/adwaita-theme.el b/etc/themes/adwaita-theme.el
index 3f29b9f061f..73ef7b6e9ee 100644
--- a/etc/themes/adwaita-theme.el
+++ b/etc/themes/adwaita-theme.el
@@ -39,7 +39,7 @@ default look of the Gnome 3 desktop.")
39 `(header-line ((,class (:foreground "#CCCCCC" :background "black")))) 39 `(header-line ((,class (:foreground "#CCCCCC" :background "black"))))
40 40
41 `(minibuffer-prompt ((,class (:foreground "#0084C8" :bold t)))) 41 `(minibuffer-prompt ((,class (:foreground "#0084C8" :bold t))))
42 `(region ((,class (:foreground unspecified :background "#C2D5E9" :extend t)))) 42 `(region ((,class (:foreground unspecified :background "#C2D5E9"))))
43 `(dired-header ((,class (:bold t :foreground "#0084C8")))) 43 `(dired-header ((,class (:bold t :foreground "#0084C8"))))
44 `(widget-button ((,class (:bold t :foreground "#0084C8")))) 44 `(widget-button ((,class (:bold t :foreground "#0084C8"))))
45 45
@@ -96,7 +96,7 @@ default look of the Gnome 3 desktop.")
96 `(gnus-cite-1 ((,class (:foreground "#00578E")))) 96 `(gnus-cite-1 ((,class (:foreground "#00578E"))))
97 `(gnus-cite-2 ((,class (:foreground "#0084C8")))) 97 `(gnus-cite-2 ((,class (:foreground "#0084C8"))))
98 98
99 `(diff-added ((,class (:bold t :foreground "#4E9A06" :extend t)))) 99 `(diff-added ((,class (:bold t :foreground "#4E9A06"))))
100 `(diff-removed ((,class (:bold t :foreground "#F5666D" :extend t)))))) 100 `(diff-removed ((,class (:bold t :foreground "#F5666D"))))))
101 101
102;;; adwaita-theme.el ends here 102;;; adwaita-theme.el ends here
diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el
index d50a641930a..d04a270ba5e 100644
--- a/etc/themes/deeper-blue-theme.el
+++ b/etc/themes/deeper-blue-theme.el
@@ -43,9 +43,9 @@
43 ;; `(diff-added ((,class (nil)))) 43 ;; `(diff-added ((,class (nil))))
44 ;; `(diff-changed ((,class (nil)))) 44 ;; `(diff-changed ((,class (nil))))
45 `(diff-context ((,class (:foreground "seashell4")))) 45 `(diff-context ((,class (:foreground "seashell4"))))
46 `(diff-file-header ((,class (:background "grey60" :extend t)))) 46 `(diff-file-header ((,class (:background "grey60"))))
47 `(diff-function ((,class (:inherit diff-header)))) 47 `(diff-function ((,class (:inherit diff-header))))
48 `(diff-header ((,class (:background "grey45" :extend t)))) 48 `(diff-header ((,class (:background "grey45"))))
49 `(diff-hunk-header ((,class (:inherit diff-header)))) 49 `(diff-hunk-header ((,class (:inherit diff-header))))
50 `(diff-index ((,class (:inherit diff-file-header)))) 50 `(diff-index ((,class (:inherit diff-file-header))))
51 `(diff-indicator-added ((,class (:foreground "white" :background "darkolivegreen")))) 51 `(diff-indicator-added ((,class (:foreground "white" :background "darkolivegreen"))))
@@ -54,12 +54,12 @@
54 `(diff-refine-change ((,class (:background "skyblue4")))) 54 `(diff-refine-change ((,class (:background "skyblue4"))))
55 ;; `(diff-removed ((,class (nil)))) 55 ;; `(diff-removed ((,class (nil))))
56 `(dired-marked ((,class (:background "dodgerblue3" :foreground "white")))) 56 `(dired-marked ((,class (:background "dodgerblue3" :foreground "white"))))
57 `(ediff-current-diff-A ((,class (:background "green4" :foreground "white" :extend t)))) 57 `(ediff-current-diff-A ((,class (:background "green4" :foreground "white"))))
58 `(ediff-current-diff-B ((,class (:background "darkorange3" :foreground "white" :extend t)))) 58 `(ediff-current-diff-B ((,class (:background "darkorange3" :foreground "white"))))
59 `(ediff-even-diff-B ((,class (:background "Grey50" :foreground "White" :extend t)))) 59 `(ediff-even-diff-B ((,class (:background "Grey50" :foreground "White"))))
60 `(ediff-fine-diff-A ((,class (:background "skyblue4" :foreground "white")))) 60 `(ediff-fine-diff-A ((,class (:background "skyblue4" :foreground "white"))))
61 `(ediff-fine-diff-B ((,class (:background "cyan4" :foreground "white")))) 61 `(ediff-fine-diff-B ((,class (:background "cyan4" :foreground "white"))))
62 `(ediff-odd-diff-A ((,class (:background "Grey50" :foreground "White" :extend t)))) 62 `(ediff-odd-diff-A ((,class (:background "Grey50" :foreground "White"))))
63 `(error ((,class (:foreground "red")))) 63 `(error ((,class (:foreground "red"))))
64 `(flymake-errline ((,class (:background nil :underline "red")))) 64 `(flymake-errline ((,class (:background nil :underline "red"))))
65 `(flymake-warnline ((,class (:background nil :underline "magenta3")))) 65 `(flymake-warnline ((,class (:background nil :underline "magenta3"))))
@@ -102,7 +102,7 @@
102 `(outline-4 ((,class (:foreground "turquoise2")))) 102 `(outline-4 ((,class (:foreground "turquoise2"))))
103 `(outline-5 ((,class (:foreground "aquamarine1")))) 103 `(outline-5 ((,class (:foreground "aquamarine1"))))
104 `(primary-selection ((,class (:background "blue3")))) 104 `(primary-selection ((,class (:background "blue3"))))
105 `(region ((,class (:background "#103050" :extend t)))) 105 `(region ((,class (:background "#103050"))))
106 `(show-paren-match-face ((,class (:background "dodgerblue1" :foreground "white")))) 106 `(show-paren-match-face ((,class (:background "dodgerblue1" :foreground "white"))))
107 `(show-paren-mismatch-face ((,class (:background "red1" :foreground "white")))) 107 `(show-paren-mismatch-face ((,class (:background "red1" :foreground "white"))))
108 `(success ((,class (:foreground "SeaGreen2")))) 108 `(success ((,class (:foreground "SeaGreen2"))))
diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el
index d585752ea4c..b361fe5c509 100644
--- a/etc/themes/dichromacy-theme.el
+++ b/etc/themes/dichromacy-theme.el
@@ -46,8 +46,8 @@ Ansi-Color faces are included.")
46 ;; Highlighting faces 46 ;; Highlighting faces
47 `(fringe ((,class (:background "#f7f7f7")))) 47 `(fringe ((,class (:background "#f7f7f7"))))
48 `(highlight ((,class (:foreground ,blue :background "#e5e5e5")))) 48 `(highlight ((,class (:foreground ,blue :background "#e5e5e5"))))
49 `(region ((,class (:foreground unspecified :background ,yellow :extend t)))) 49 `(region ((,class (:foreground unspecified :background ,yellow))))
50 `(secondary-selection ((,class (:background "#e5e5e5" :extend t)))) 50 `(secondary-selection ((,class (:background "#e5e5e5"))))
51 `(isearch ((,class (:foreground "white" :background ,vermillion)))) 51 `(isearch ((,class (:foreground "white" :background ,vermillion))))
52 `(lazy-highlight ((,class (:foreground "white" :background ,redpurple)))) 52 `(lazy-highlight ((,class (:foreground "white" :background ,redpurple))))
53 `(trailing-whitespace ((,class (:background ,vermillion)))) 53 `(trailing-whitespace ((,class (:background ,vermillion))))
diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el
index 677d91c5b74..d544f28da79 100644
--- a/etc/themes/leuven-theme.el
+++ b/etc/themes/leuven-theme.el
@@ -48,12 +48,12 @@ Semantic, and Ansi-Color faces are included -- and much more...")
48 (code-block '(:foreground "#000088" :background "#FFFFE0")) 48 (code-block '(:foreground "#000088" :background "#FFFFE0"))
49 (code-inline '(:foreground "#006400" :background "#FDFFF7")) 49 (code-inline '(:foreground "#006400" :background "#FDFFF7"))
50 (column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#E6AD4F" :background "#FFF2DE")) 50 (column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#E6AD4F" :background "#FFF2DE"))
51 (diff-added '(:foreground "#008000" :background "#DDFFDD" :extend t)) 51 (diff-added '(:foreground "#008000" :background "#DDFFDD"))
52 (diff-changed '(:foreground "#0000FF" :background "#DDDDFF")) 52 (diff-changed '(:foreground "#0000FF" :background "#DDDDFF"))
53 (diff-header '(:foreground "#800000" :background "#FFFFAF" :extend t)) 53 (diff-header '(:foreground "#800000" :background "#FFFFAF"))
54 (diff-hunk-header '(:foreground "#990099" :background "#FFEEFF")) 54 (diff-hunk-header '(:foreground "#990099" :background "#FFEEFF"))
55 (diff-none '(:foreground "gray33")) 55 (diff-none '(:foreground "gray33"))
56 (diff-removed '(:foreground "#A60000" :background "#FFDDDD" :extend t)) 56 (diff-removed '(:foreground "#A60000" :background "#FFDDDD"))
57 (directory '(:weight bold :foreground "blue" :background "#FFFFD2")) 57 (directory '(:weight bold :foreground "blue" :background "#FFFFD2"))
58 (highlight-line '(:background "#FFFFD7")) ; #F5F5F5 58 (highlight-line '(:background "#FFFFD7")) ; #F5F5F5
59 (highlight-line-gnus '(:background "#DAEAFC")) ; defined in `gnus-leuven.el' 59 (highlight-line-gnus '(:background "#DAEAFC")) ; defined in `gnus-leuven.el'
@@ -76,7 +76,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
76 (ol8 '(:height 1.0 :weight bold :slant italic :foreground "#FD8008")) 76 (ol8 '(:height 1.0 :weight bold :slant italic :foreground "#FD8008"))
77 (paren-matched '(:background "#99CCFF")) 77 (paren-matched '(:background "#99CCFF"))
78 (paren-unmatched '(:underline "red" :foreground nil :background "#FFDCDC")) 78 (paren-unmatched '(:underline "red" :foreground nil :background "#FFDCDC"))
79 (region '(:background "#ABDFFA" :extend t)) 79 (region '(:background "#ABDFFA"))
80 (shadow '(:foreground "#7F7F7F")) 80 (shadow '(:foreground "#7F7F7F"))
81 (string '(:foreground "#008000")) ; or #D0372D 81 (string '(:foreground "#008000")) ; or #D0372D
82 (subject '(:family "Sans Serif" :weight bold :foreground "black")) 82 (subject '(:family "Sans Serif" :weight bold :foreground "black"))
@@ -243,15 +243,15 @@ Semantic, and Ansi-Color faces are included -- and much more...")
243 `(smerge-refined-change ((,class (:background "#AAAAFF")))) 243 `(smerge-refined-change ((,class (:background "#AAAAFF"))))
244 244
245 ;; Ediff 245 ;; Ediff
246 `(ediff-current-diff-A ((,class (:foreground "gray33" :background "#FFDDDD" :extend t)))) 246 `(ediff-current-diff-A ((,class (:foreground "gray33" :background "#FFDDDD"))))
247 `(ediff-current-diff-B ((,class (:foreground "gray33" :background "#DDFFDD" :extend t)))) 247 `(ediff-current-diff-B ((,class (:foreground "gray33" :background "#DDFFDD"))))
248 `(ediff-current-diff-C ((,class (:foreground "black" :background "cyan" :extend t)))) 248 `(ediff-current-diff-C ((,class (:foreground "black" :background "cyan"))))
249 `(ediff-even-diff-A ((,class (:foreground "black" :background "light grey" :extend t)))) 249 `(ediff-even-diff-A ((,class (:foreground "black" :background "light grey"))))
250 `(ediff-even-diff-B ((,class (:foreground "black" :background "light grey" :extend t)))) 250 `(ediff-even-diff-B ((,class (:foreground "black" :background "light grey"))))
251 `(ediff-fine-diff-A ((,class (:foreground "#A60000" :background "#FFAAAA")))) 251 `(ediff-fine-diff-A ((,class (:foreground "#A60000" :background "#FFAAAA"))))
252 `(ediff-fine-diff-B ((,class (:foreground "#008000" :background "#55FF55")))) 252 `(ediff-fine-diff-B ((,class (:foreground "#008000" :background "#55FF55"))))
253 `(ediff-odd-diff-A ((,class (:foreground "black" :background "light grey" :extend t)))) 253 `(ediff-odd-diff-A ((,class (:foreground "black" :background "light grey"))))
254 `(ediff-odd-diff-B ((,class (:foreground "black" :background "light grey" :extend t)))) 254 `(ediff-odd-diff-B ((,class (:foreground "black" :background "light grey"))))
255 255
256 ;; Flyspell 256 ;; Flyspell
257;; (when (version< emacs-version "24.XXX") 257;; (when (version< emacs-version "24.XXX")
@@ -462,7 +462,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
462 `(info-xref-visited ((,class (:underline t :foreground "magenta4")))) ; previously visited cross-references 462 `(info-xref-visited ((,class (:underline t :foreground "magenta4")))) ; previously visited cross-references
463 `(light-symbol-face ((,class (:background "#FFFFA0")))) 463 `(light-symbol-face ((,class (:background "#FFFFA0"))))
464 `(linum ((,class (:inherit (default shadow) :foreground "#9A9A9A" :background "#EDEDED")))) 464 `(linum ((,class (:inherit (default shadow) :foreground "#9A9A9A" :background "#EDEDED"))))
465 `(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5" :extend t)))) 465 `(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
466 `(lui-button-face ((,class ,link))) 466 `(lui-button-face ((,class ,link)))
467 `(lui-highlight-face ((,class (:box '(:line-width 1 :color "#CC0000") :foreground "#CC0000" :background "#FFFF88")))) ; my nickname 467 `(lui-highlight-face ((,class (:box '(:line-width 1 :color "#CC0000") :foreground "#CC0000" :background "#FFFF88")))) ; my nickname
468 `(lui-time-stamp-face ((,class (:foreground "purple")))) 468 `(lui-time-stamp-face ((,class (:foreground "purple"))))
diff --git a/etc/themes/light-blue-theme.el b/etc/themes/light-blue-theme.el
index e6d4a3a4b57..3060dcf09c7 100644
--- a/etc/themes/light-blue-theme.el
+++ b/etc/themes/light-blue-theme.el
@@ -36,8 +36,8 @@
36 `(fringe ((,class (:background "gray85")))) 36 `(fringe ((,class (:background "gray85"))))
37 ;; Highlighting faces 37 ;; Highlighting faces
38 `(highlight ((,class (:background "cyan")))) 38 `(highlight ((,class (:background "cyan"))))
39 `(region ((,class (:background "MediumAquamarine" :extend t)))) 39 `(region ((,class (:background "MediumAquamarine"))))
40 `(secondary-selection ((,class (:background "white" :foreground "black" :extend t)))) 40 `(secondary-selection ((,class (:background "white" :foreground "black"))))
41 `(isearch ((,class (:background "green" :foreground "Black")))) 41 `(isearch ((,class (:background "green" :foreground "Black"))))
42 `(lazy-highlight ((,class (:background "dark turquoise")))) 42 `(lazy-highlight ((,class (:background "dark turquoise"))))
43 `(query-replace ((,class (:inherit isearch :background "white" :foreground "black")))) 43 `(query-replace ((,class (:inherit isearch :background "white" :foreground "black"))))
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
index 1313caa3c6e..20e04cb7543 100644
--- a/etc/themes/manoj-dark-theme.el
+++ b/etc/themes/manoj-dark-theme.el
@@ -435,11 +435,11 @@ jarring angry fruit salad look to reduce eye fatigue.")
435 '(diary-button ((t (:background "lightgrey" :foreground "black" :box (:line-width 2 :style released-button))))) 435 '(diary-button ((t (:background "lightgrey" :foreground "black" :box (:line-width 2 :style released-button)))))
436 '(diary-face ((t (:foreground "IndianRed")))) 436 '(diary-face ((t (:foreground "IndianRed"))))
437 '(diary-time ((t (:foreground "LightGoldenrod")))) 437 '(diary-time ((t (:foreground "LightGoldenrod"))))
438 '(diff-added ((t (:foreground "Green" :extend t)))) 438 '(diff-added ((t (:foreground "Green"))))
439 '(diff-added-face ((t (:foreground "Green")))) 439 '(diff-added-face ((t (:foreground "Green"))))
440 '(diff-changed-face ((t (:foreground "Khaki")))) 440 '(diff-changed-face ((t (:foreground "Khaki"))))
441 '(diff-context-face ((t (:foreground "grey70")))) 441 '(diff-context-face ((t (:foreground "grey70"))))
442 '(diff-file-header ((t (:bold t :background "grey20" :foreground "ivory1" :weight bold :extend t)))) 442 '(diff-file-header ((t (:bold t :background "grey20" :foreground "ivory1" :weight bold))))
443 '(diff-file-header-face ((t (:bold t :background "grey20" :foreground "ivory1" :weight bold)))) 443 '(diff-file-header-face ((t (:bold t :background "grey20" :foreground "ivory1" :weight bold))))
444 '(diff-function-face ((t (:foreground "SpringGreen1")))) 444 '(diff-function-face ((t (:foreground "SpringGreen1"))))
445 '(diff-header-face ((t (:background "SlateBlue4")))) 445 '(diff-header-face ((t (:background "SlateBlue4"))))
@@ -448,7 +448,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
448 '(diff-index-face ((t (:bold t :weight bold :background "SteelBlue4" :foreground "linen" )))) 448 '(diff-index-face ((t (:bold t :weight bold :background "SteelBlue4" :foreground "linen" ))))
449 '(diff-nonexistent ((t (:bold t :weight bold :background "Black" :foreground "Wheat1")))) 449 '(diff-nonexistent ((t (:bold t :weight bold :background "Black" :foreground "Wheat1"))))
450 '(diff-nonexistent-face ((t (:bold t :weight bold :background "Black" :foreground "Wheat1")))) 450 '(diff-nonexistent-face ((t (:bold t :weight bold :background "Black" :foreground "Wheat1"))))
451 '(diff-removed ((t (:foreground "salmon1" :extend t)))) 451 '(diff-removed ((t (:foreground "salmon1"))))
452 '(diff-removed-face ((t (:foreground "salmon1")))) 452 '(diff-removed-face ((t (:foreground "salmon1"))))
453 '(diff-refine-change-face ((t (:background "MidnightBlue")))) 453 '(diff-refine-change-face ((t (:background "MidnightBlue"))))
454 '(diff-refine-change ((t (:background "MidnightBlue")))) 454 '(diff-refine-change ((t (:background "MidnightBlue"))))
@@ -511,7 +511,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
511 '(header-line ((t (:box (:line-width -1 :color "grey20" :style released-button) :background "grey20" :foreground "grey90" :height 0.9)))) 511 '(header-line ((t (:box (:line-width -1 :color "grey20" :style released-button) :background "grey20" :foreground "grey90" :height 0.9))))
512 '(help-argument-name ((t (:italic t :slant italic)))) 512 '(help-argument-name ((t (:italic t :slant italic))))
513 '(highlight ((t (:background "gray10" :foreground "Old Lace")))) 513 '(highlight ((t (:background "gray10" :foreground "Old Lace"))))
514 '(hl-line ((t (:background "grey10" :foreground "Old Lace" :extend t)))) 514 '(hl-line ((t (:background "grey10" :foreground "Old Lace"))))
515 '(gnus-mouse-face ((t (:background "darkseagreen2" :foreground "blue")))) 515 '(gnus-mouse-face ((t (:background "darkseagreen2" :foreground "blue"))))
516 '(erc-button-mouse-face ((t (:background "darkseagreen2" :foreground "blue")))) 516 '(erc-button-mouse-face ((t (:background "darkseagreen2" :foreground "blue"))))
517 '(align-highlight-change-face ((t (:background "darkseagreen2" :foreground "blue")))) 517 '(align-highlight-change-face ((t (:background "darkseagreen2" :foreground "blue"))))
@@ -601,7 +601,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
601 '(paren-mismatch-face ((t (:bold t :background "white" :foreground "red")))) 601 '(paren-mismatch-face ((t (:bold t :background "white" :foreground "red"))))
602 '(paren-no-match-face ((t (:bold t :background "white" :foreground "red")))) 602 '(paren-no-match-face ((t (:bold t :background "white" :foreground "red"))))
603 '(query-replace ((t (:foreground "brown4" :background "palevioletred2")))) 603 '(query-replace ((t (:foreground "brown4" :background "palevioletred2"))))
604 '(region ((t (:background "blue3" :extend t)))) 604 '(region ((t (:background "blue3"))))
605 '(realgud-overlay-arrow1 ((t (:foreground "medium sea green")))) 605 '(realgud-overlay-arrow1 ((t (:foreground "medium sea green"))))
606 '(realgud-overlay-arrow2 ((t (:foreground "white")))) 606 '(realgud-overlay-arrow2 ((t (:foreground "white"))))
607 '(realgud-overlay-arrow3 ((t (:foreground "indian red")))) 607 '(realgud-overlay-arrow3 ((t (:foreground "indian red"))))
@@ -613,7 +613,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
613 '(realgud-line-number ((t (:foreground "yellow")))) 613 '(realgud-line-number ((t (:foreground "yellow"))))
614 '(realgud-backtrace-number ((t (:foreground "yellow" :weight bold)))) 614 '(realgud-backtrace-number ((t (:foreground "yellow" :weight bold))))
615 '(scroll-bar ((t (:background "grey75" :foreground "WhiteSmoke")))) 615 '(scroll-bar ((t (:background "grey75" :foreground "WhiteSmoke"))))
616 '(secondary-selection ((t (:background "SkyBlue4" :extend t)))) 616 '(secondary-selection ((t (:background "SkyBlue4"))))
617 '(semantic-dirty-token-face ((t (:background "lightyellow")))) 617 '(semantic-dirty-token-face ((t (:background "lightyellow"))))
618 '(semantic-highlight-edits-face ((t (:background "gray20")))) 618 '(semantic-highlight-edits-face ((t (:background "gray20"))))
619 '(semantic-unmatched-syntax-face ((t (:underline "red")))) 619 '(semantic-unmatched-syntax-face ((t (:underline "red"))))
@@ -631,10 +631,10 @@ jarring angry fruit salad look to reduce eye fatigue.")
631 '(show-paren-match ((t (:background "steelblue3")))) 631 '(show-paren-match ((t (:background "steelblue3"))))
632 '(show-paren-match-face ((t (:background "steelblue3")))) 632 '(show-paren-match-face ((t (:background "steelblue3"))))
633 '(show-paren-mismatch ((t (:background "purple" :foreground "white")))) 633 '(show-paren-mismatch ((t (:background "purple" :foreground "white"))))
634 '(smerge-base ((t (:foreground "orange" :extend t)))) 634 '(smerge-base ((t (:foreground "orange"))))
635 '(smerge-markers ((t (:background "grey30" :extend t)))) 635 '(smerge-markers ((t (:background "grey30"))))
636 '(smerge-mine ((t (:foreground "cyan" :extend t)))) 636 '(smerge-mine ((t (:foreground "cyan"))))
637 '(smerge-other ((t (:foreground "lightgreen" :extend t)))) 637 '(smerge-other ((t (:foreground "lightgreen"))))
638 '(smerge-refined-change ((t (:background "blue4")))) 638 '(smerge-refined-change ((t (:background "blue4"))))
639 '(speedbar-button-face ((t (:foreground "green3")))) 639 '(speedbar-button-face ((t (:foreground "green3"))))
640 '(speedbar-directory-face ((t (:foreground "light blue")))) 640 '(speedbar-directory-face ((t (:foreground "light blue"))))
diff --git a/etc/themes/misterioso-theme.el b/etc/themes/misterioso-theme.el
index c7e1dc983fb..727270c27f5 100644
--- a/etc/themes/misterioso-theme.el
+++ b/etc/themes/misterioso-theme.el
@@ -37,7 +37,7 @@
37 ;; Highlighting faces 37 ;; Highlighting faces
38 `(fringe ((,class (:background "#2e3748")))) 38 `(fringe ((,class (:background "#2e3748"))))
39 `(highlight ((,class (:background "#338f86" :foreground "#e1e1e0")))) 39 `(highlight ((,class (:background "#338f86" :foreground "#e1e1e0"))))
40 `(region ((,class (:background "#2d4948" :foreground "#e1e1e0" :extend t)))) 40 `(region ((,class (:background "#2d4948" :foreground "#e1e1e0"))))
41 `(isearch ((,class (:background "#fcffad" :foreground "#000000")))) 41 `(isearch ((,class (:background "#fcffad" :foreground "#000000"))))
42 `(lazy-highlight ((,class (:background "#338f86")))) 42 `(lazy-highlight ((,class (:background "#338f86"))))
43 `(trailing-whitespace ((,class (:background "#ff4242")))) 43 `(trailing-whitespace ((,class (:background "#ff4242"))))
diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el
index d2fdff8e091..91256208a3f 100644
--- a/etc/themes/tango-dark-theme.el
+++ b/etc/themes/tango-dark-theme.el
@@ -61,8 +61,8 @@ Semantic, and Ansi-Color faces are included.")
61 ;; Highlighting faces 61 ;; Highlighting faces
62 `(fringe ((,class (:background ,alum-7)))) 62 `(fringe ((,class (:background ,alum-7))))
63 `(highlight ((,class (:foreground ,alum-6 :background "#c0c000")))) 63 `(highlight ((,class (:foreground ,alum-6 :background "#c0c000"))))
64 `(region ((,class (:background ,alum-5 :extend t)))) 64 `(region ((,class (:background ,alum-5))))
65 `(secondary-selection ((,class (:background ,blue-3 :extend t)))) 65 `(secondary-selection ((,class (:background ,blue-3))))
66 `(isearch ((,class (:foreground ,alum-1 :background ,orange-3)))) 66 `(isearch ((,class (:foreground ,alum-1 :background ,orange-3))))
67 `(lazy-highlight ((,class (:background ,choc-3)))) 67 `(lazy-highlight ((,class (:background ,choc-3))))
68 `(trailing-whitespace ((,class (:background ,red-3)))) 68 `(trailing-whitespace ((,class (:background ,red-3))))
@@ -130,14 +130,14 @@ Semantic, and Ansi-Color faces are included.")
130 ;; SMerge faces 130 ;; SMerge faces
131 `(smerge-refined-change ((,class (:background ,blue-3)))) 131 `(smerge-refined-change ((,class (:background ,blue-3))))
132 ;; Ediff faces 132 ;; Ediff faces
133 `(ediff-current-diff-A ((,class (:background ,alum-5 :extend t)))) 133 `(ediff-current-diff-A ((,class (:background ,alum-5))))
134 `(ediff-fine-diff-A ((,class (:background ,blue-3)))) 134 `(ediff-fine-diff-A ((,class (:background ,blue-3))))
135 `(ediff-even-diff-A ((,class (:background ,alum-5.5 :extend t)))) 135 `(ediff-even-diff-A ((,class (:background ,alum-5.5))))
136 `(ediff-odd-diff-A ((,class (:background ,alum-5.5 :extend t)))) 136 `(ediff-odd-diff-A ((,class (:background ,alum-5.5))))
137 `(ediff-current-diff-B ((,class (:background ,alum-5 :extend t)))) 137 `(ediff-current-diff-B ((,class (:background ,alum-5))))
138 `(ediff-fine-diff-B ((,class (:background ,choc-3)))) 138 `(ediff-fine-diff-B ((,class (:background ,choc-3))))
139 `(ediff-even-diff-B ((,class (:background ,alum-5.5 :extend t)))) 139 `(ediff-even-diff-B ((,class (:background ,alum-5.5))))
140 `(ediff-odd-diff-B ((,class (:background ,alum-5.5 :extend t)))) 140 `(ediff-odd-diff-B ((,class (:background ,alum-5.5))))
141 ;; Flyspell faces 141 ;; Flyspell faces
142 `(flyspell-duplicate ((,class (:underline ,orange-1)))) 142 `(flyspell-duplicate ((,class (:underline ,orange-1))))
143 `(flyspell-incorrect ((,class (:underline ,red-1)))) 143 `(flyspell-incorrect ((,class (:underline ,red-1))))
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index c832192968a..12d4db3fe7c 100644
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -53,8 +53,8 @@ Semantic, and Ansi-Color faces are included.")
53 ;; Highlighting faces 53 ;; Highlighting faces
54 `(fringe ((,class (:background ,alum-2)))) 54 `(fringe ((,class (:background ,alum-2))))
55 `(highlight ((,class (:background ,alum-3)))) 55 `(highlight ((,class (:background ,alum-3))))
56 `(region ((,class (:background ,alum-3 :extend t)))) 56 `(region ((,class (:background ,alum-3))))
57 `(secondary-selection ((,class (:background ,blue-0 :extend t)))) 57 `(secondary-selection ((,class (:background ,blue-0))))
58 `(isearch ((,class (:foreground "#ffffff" :background ,orange-3)))) 58 `(isearch ((,class (:foreground "#ffffff" :background ,orange-3))))
59 `(lazy-highlight ((,class (:background ,choc-1)))) 59 `(lazy-highlight ((,class (:background ,choc-1))))
60 `(trailing-whitespace ((,class (:background ,red-1)))) 60 `(trailing-whitespace ((,class (:background ,red-1))))
@@ -117,9 +117,9 @@ Semantic, and Ansi-Color faces are included.")
117 ;; SMerge 117 ;; SMerge
118 `(smerge-refined-change ((,class (:background ,plum-1)))) 118 `(smerge-refined-change ((,class (:background ,plum-1))))
119 ;; Ediff 119 ;; Ediff
120 `(ediff-current-diff-A ((,class (:background ,blue-1 :extend t)))) 120 `(ediff-current-diff-A ((,class (:background ,blue-1))))
121 `(ediff-fine-diff-A ((,class (:background ,plum-1)))) 121 `(ediff-fine-diff-A ((,class (:background ,plum-1))))
122 `(ediff-current-diff-B ((,class (:background ,butter-1 :extend t)))) 122 `(ediff-current-diff-B ((,class (:background ,butter-1))))
123 `(ediff-fine-diff-B ((,class (:background ,orange-1)))) 123 `(ediff-fine-diff-B ((,class (:background ,orange-1))))
124 ;; Flyspell 124 ;; Flyspell
125 `(flyspell-duplicate ((,class (:underline ,orange-1)))) 125 `(flyspell-duplicate ((,class (:underline ,orange-1))))
diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el
index bd0564a21dc..5482ced6b29 100644
--- a/etc/themes/tsdh-dark-theme.el
+++ b/etc/themes/tsdh-dark-theme.el
@@ -26,12 +26,12 @@
26 'tsdh-dark 26 'tsdh-dark
27 '(aw-leading-char-face ((t (:background "gray30" :foreground "red" :weight bold)))) 27 '(aw-leading-char-face ((t (:background "gray30" :foreground "red" :weight bold))))
28 '(default ((t (:background "gray20" :foreground "white smoke")))) 28 '(default ((t (:background "gray20" :foreground "white smoke"))))
29 '(diff-added ((t (:inherit diff-changed :background "dark green" :extend t))) t) 29 '(diff-added ((t (:inherit diff-changed :background "dark green"))) t)
30 '(diff-changed ((t (:background "midnight blue"))) t) 30 '(diff-changed ((t (:background "midnight blue"))) t)
31 '(diff-indicator-added ((t (:inherit diff-indicator-changed))) t) 31 '(diff-indicator-added ((t (:inherit diff-indicator-changed))) t)
32 '(diff-indicator-changed ((t (:weight bold))) t) 32 '(diff-indicator-changed ((t (:weight bold))) t)
33 '(diff-indicator-removed ((t (:inherit diff-indicator-changed))) t) 33 '(diff-indicator-removed ((t (:inherit diff-indicator-changed))) t)
34 '(diff-removed ((t (:inherit diff-changed :background "dark red" :extend t))) t) 34 '(diff-removed ((t (:inherit diff-changed :background "dark red"))) t)
35 '(dired-directory ((t (:foreground "DodgerBlue" :weight bold)))) 35 '(dired-directory ((t (:foreground "DodgerBlue" :weight bold))))
36 '(error ((t (:foreground "deep pink" :weight bold)))) 36 '(error ((t (:foreground "deep pink" :weight bold))))
37 '(eshell-prompt ((t (:inherit font-lock-function-name-face :weight bold)))) 37 '(eshell-prompt ((t (:inherit font-lock-function-name-face :weight bold))))
@@ -69,7 +69,7 @@
69 '(header-line ((t (:inverse-video t :box (:line-width -1 :color "red" :style released-button))))) 69 '(header-line ((t (:inverse-video t :box (:line-width -1 :color "red" :style released-button)))))
70 '(helm-header ((t (:background "DeepSkyBlue4" :weight bold)))) 70 '(helm-header ((t (:background "DeepSkyBlue4" :weight bold))))
71 '(highlight ((t (:background "sea green")))) 71 '(highlight ((t (:background "sea green"))))
72 '(hl-line ((t (:background "grey25" :extend t)))) 72 '(hl-line ((t (:background "grey25"))))
73 '(hl-paren-face ((t (:weight bold))) t) 73 '(hl-paren-face ((t (:weight bold))) t)
74 '(icomplete-first-match ((t (:foreground "deep sky blue" :weight bold)))) 74 '(icomplete-first-match ((t (:foreground "deep sky blue" :weight bold))))
75 '(ido-first-match ((t (:foreground "turquoise" :weight bold)))) 75 '(ido-first-match ((t (:foreground "turquoise" :weight bold))))
@@ -132,9 +132,9 @@
132 '(rcirc-other-nick ((t (:foreground "dodger blue"))) t) 132 '(rcirc-other-nick ((t (:foreground "dodger blue"))) t)
133 '(rcirc-track-keyword ((t (:foreground "DodgerBlue" :weight bold))) t) 133 '(rcirc-track-keyword ((t (:foreground "DodgerBlue" :weight bold))) t)
134 '(rcirc-track-nick ((t (:background "yellow" :foreground "DodgerBlue" :weight bold))) t) 134 '(rcirc-track-nick ((t (:background "yellow" :foreground "DodgerBlue" :weight bold))) t)
135 '(region ((t (:background "SeaGreen4" :extend t)))) 135 '(region ((t (:background "SeaGreen4"))))
136 '(scroll-bar ((t (:background "gray20" :foreground "dark turquoise")))) 136 '(scroll-bar ((t (:background "gray20" :foreground "dark turquoise"))))
137 '(secondary-selection ((t (:background "#333366" :foreground "#f6f3e8" :extend t)))) 137 '(secondary-selection ((t (:background "#333366" :foreground "#f6f3e8"))))
138 '(show-paren-match ((t (:background "DeepSkyBlue4")))) 138 '(show-paren-match ((t (:background "DeepSkyBlue4"))))
139 '(show-paren-mismatch ((t (:background "dark magenta")))) 139 '(show-paren-mismatch ((t (:background "dark magenta"))))
140 '(swiper-match-face-1 ((t (:background "gray35")))) 140 '(swiper-match-face-1 ((t (:background "gray35"))))
diff --git a/etc/themes/tsdh-light-theme.el b/etc/themes/tsdh-light-theme.el
index efc49c1a216..8e6a79f8e36 100644
--- a/etc/themes/tsdh-light-theme.el
+++ b/etc/themes/tsdh-light-theme.el
@@ -29,12 +29,12 @@ Used and created by Tassilo Horn.")
29 '(Info-quoted ((t (:underline "gray40" :weight bold)))) 29 '(Info-quoted ((t (:underline "gray40" :weight bold))))
30 '(aw-leading-char-face ((t (:background "red" :foreground "white" :weight bold)))) 30 '(aw-leading-char-face ((t (:background "red" :foreground "white" :weight bold))))
31 '(default ((t (:background "white" :foreground "black")))) 31 '(default ((t (:background "white" :foreground "black"))))
32 '(diff-added ((t (:inherit diff-changed :background "light green" :extend t)))) 32 '(diff-added ((t (:inherit diff-changed :background "light green"))))
33 '(diff-changed ((t (:background "light steel blue")))) 33 '(diff-changed ((t (:background "light steel blue"))))
34 '(diff-indicator-added ((t (:inherit diff-indicator-changed)))) 34 '(diff-indicator-added ((t (:inherit diff-indicator-changed))))
35 '(diff-indicator-changed ((t (:weight bold)))) 35 '(diff-indicator-changed ((t (:weight bold))))
36 '(diff-indicator-removed ((t (:inherit diff-indicator-changed)))) 36 '(diff-indicator-removed ((t (:inherit diff-indicator-changed))))
37 '(diff-removed ((t (:inherit diff-changed :background "sandy brown" :extend t)))) 37 '(diff-removed ((t (:inherit diff-changed :background "sandy brown"))))
38 '(dired-directory ((t (:inherit font-lock-function-name-face :weight bold)))) 38 '(dired-directory ((t (:inherit font-lock-function-name-face :weight bold))))
39 '(font-lock-builtin-face ((t (:foreground "#e44649")))) 39 '(font-lock-builtin-face ((t (:foreground "#e44649"))))
40 '(font-lock-comment-delimiter-face ((t (:inherit font-lock-comment-face :weight bold)))) 40 '(font-lock-comment-delimiter-face ((t (:inherit font-lock-comment-face :weight bold))))
@@ -62,7 +62,7 @@ Used and created by Tassilo Horn.")
62 '(gnus-group-news-2-empty ((t (:foreground "tomato3")))) 62 '(gnus-group-news-2-empty ((t (:foreground "tomato3"))))
63 '(gnus-group-news-3 ((t (:inherit gnus-group-news-3-empty :weight bold)))) 63 '(gnus-group-news-3 ((t (:inherit gnus-group-news-3-empty :weight bold))))
64 '(gnus-group-news-3-empty ((t (:foreground "tomato2")))) '(header-line ((t (:inherit mode-line :inverse-video t)))) 64 '(gnus-group-news-3-empty ((t (:foreground "tomato2")))) '(header-line ((t (:inherit mode-line :inverse-video t))))
65 '(hl-line ((t (:background "#f0f0f1" :extend t)))) 65 '(hl-line ((t (:background "#f0f0f1"))))
66 '(hl-paren-face ((t (:weight bold))) t) 66 '(hl-paren-face ((t (:weight bold))) t)
67 '(minibuffer-prompt ((t (:foreground "#0184bc" :box (:line-width -1 :style released-button) :weight bold)))) 67 '(minibuffer-prompt ((t (:foreground "#0184bc" :box (:line-width -1 :style released-button) :weight bold))))
68 '(mode-line ((t (:background "#f0f0f1" :box (:line-width 1 :color "#383a42"))))) 68 '(mode-line ((t (:background "#f0f0f1" :box (:line-width 1 :color "#383a42")))))
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 2628b68ff06..640343a33bc 100644
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -40,8 +40,8 @@ of green, brown, and blue.")
40 `(compilation-info ((,class (:foreground "ForestGreen")))) 40 `(compilation-info ((,class (:foreground "ForestGreen"))))
41 ;; Highlighting faces 41 ;; Highlighting faces
42 `(highlight ((,class (:foreground "white" :background "dark green")))) 42 `(highlight ((,class (:foreground "white" :background "dark green"))))
43 `(region ((,class (:foreground "white" :background "dark green" :extend t)))) 43 `(region ((,class (:foreground "white" :background "dark green"))))
44 `(secondary-selection ((,class (:background "dark slate gray" :extend t)))) 44 `(secondary-selection ((,class (:background "dark slate gray"))))
45 `(isearch ((,class (:foreground "white" :background "dark goldenrod")))) 45 `(isearch ((,class (:foreground "white" :background "dark goldenrod"))))
46 `(lazy-highlight ((,class (:background "gray25")))) 46 `(lazy-highlight ((,class (:background "gray25"))))
47 ;; Font lock faces 47 ;; Font lock faces
diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el
index 0a5e87ac585..c56700ffd9a 100644
--- a/etc/themes/wombat-theme.el
+++ b/etc/themes/wombat-theme.el
@@ -36,8 +36,8 @@ are included.")
36 `(fringe ((,class (:background "#303030")))) 36 `(fringe ((,class (:background "#303030"))))
37 `(highlight ((,class (:background "#454545" :foreground "#ffffff" 37 `(highlight ((,class (:background "#454545" :foreground "#ffffff"
38 :underline t)))) 38 :underline t))))
39 `(region ((,class (:background "#444444" :foreground "#f6f3e8" :extend t)))) 39 `(region ((,class (:background "#444444" :foreground "#f6f3e8"))))
40 `(secondary-selection ((,class (:background "#333366" :foreground "#f6f3e8" :extend t)))) 40 `(secondary-selection ((,class (:background "#333366" :foreground "#f6f3e8"))))
41 `(isearch ((,class (:background "#343434" :foreground "#857b6f")))) 41 `(isearch ((,class (:background "#343434" :foreground "#857b6f"))))
42 `(lazy-highlight ((,class (:background "#384048" :foreground "#a0a8b0")))) 42 `(lazy-highlight ((,class (:background "#384048" :foreground "#a0a8b0"))))
43 ;; Mode line faces 43 ;; Mode line faces