* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
@ 2020-04-22 5:31 Fab Rice
2020-04-22 6:10 ` Stefan Kangas
` (2 more replies)
0 siblings, 3 replies; 15+ messages in thread
From: Fab Rice @ 2020-04-22 5:31 UTC (permalink / raw)
To: 40759; +Cc: dgutov
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
Dear Emacs maintainers,
I'm the author of Leuven color theme, currently in Emacs since 24.4.
But the version has not been updated for a while, while I've improved it
with time.
Could you update its code with the following patch?
(I've generated it with 'git format-patch', so that you could apply it
with 'git am'.)
Thanks in advance!
Best regards,
Fabrice Niessen
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Update-leuven-theme.el.patch --]
[-- Type: text/x-diff; name=0001-Update-leuven-theme.el.patch, Size: 71044 bytes --]
From 8db435197aa0c5ab5bf7b5c6ff32990cd7e85bb8 Mon Sep 17 00:00:00 2001
From: Fabrice Niessen <fniessen@pirilampo.org>
Date: Wed, 22 Apr 2020 07:17:45 +0200
Subject: [PATCH] Update leuven-theme.el
---
etc/themes/leuven-theme.el | 705 +++++++++++++++++++++++++++----------
1 file changed, 527 insertions(+), 178 deletions(-)
diff --git etc/themes/leuven-theme.el etc/themes/leuven-theme.el
index 0d25ab9c5b..a00f9b32a8 100644
--- etc/themes/leuven-theme.el
+++ etc/themes/leuven-theme.el
@@ -4,7 +4,7 @@
;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
;; URL: https://github.com/fniessen/emacs-leuven-theme
-;; Version: 20170912.2328
+;; Version: 20200422.0716
;; Keywords: color theme
;; This file is part of GNU Emacs.
@@ -20,7 +20,7 @@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
@@ -31,58 +31,120 @@
;;
;; (load-theme 'leuven t)
;;
-;; Requirements: Emacs 24.
+;; Requirements: Emacs 24+.
+;;
+;; NOTE -- Would you like implement a version of this for dark backgrounds,
+;; please do so! I'm willing to integrate it...
;;; Code:
+;;; Options.
+
+(defgroup leuven nil
+ "Leuven theme options.
+The theme has to be reloaded after changing anything in this group."
+ :group 'faces)
+
+(defcustom leuven-scale-outline-headlines t
+ "Scale `outline' (and `org') level-1 headlines.
+This can be nil for unscaled, t for using the theme default, or a scaling number."
+ :type '(choice
+ (const :tag "Unscaled" nil)
+ (const :tag "Default provided by theme" t)
+ (number :tag "Set scaling"))
+ :group 'leuven)
+
+(defcustom leuven-scale-org-agenda-structure t
+ "Scale Org agenda structure lines, like dates.
+This can be nil for unscaled, t for using the theme default, or a scaling number."
+ :type '(choice
+ (const :tag "Unscaled" nil)
+ (const :tag "Default provided by theme" t)
+ (number :tag "Set scaling"))
+ :group 'leuven)
+
+(defun leuven-scale-font (control default-height)
+ "Function for splicing optional font heights into face descriptions.
+CONTROL can be a number, nil, or t. When t, use DEFAULT-HEIGHT."
+ (cond
+ ((numberp control) (list :height control))
+ ((eq t control) (list :height default-height))
+ (t nil)))
+
+;;; Theme Faces.
+
(deftheme leuven
"Face colors with a light background.
-Basic, Font Lock, Isearch, Gnus, Message, Diff, Ediff, Flyspell,
-Semantic, and Ansi-Color faces are included -- and much more...")
+Basic, Font Lock, Isearch, Gnus, Message, Org mode, Diff, Ediff,
+Flyspell, Semantic, and Ansi-Color faces are included -- and much
+more...")
(let ((class '((class color) (min-colors 89)))
- ;; Leuven generic colors
- (cancel '(:slant italic :strike-through t :foreground "gray55"))
+ ;; Leuven generic colors.
+ (cancel '(:slant italic :strike-through t :foreground "#A9A9A9"))
(clock-line '(:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#EEC900"))
- (code-block '(:foreground "#000088" :background "#FFFFE0"))
- (code-inline '(:foreground "#006400" :background "#FDFFF7"))
+ (code-block '(:foreground "#000088" :background "#FFFFE0" :extend t))
+ (code-inline '(:foreground "#006400" :background "#FDFFF7" :extend t))
(column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#E6AD4F" :background "#FFF2DE"))
- (diff-added '(:foreground "#008000" :background "#DDFFDD"))
+ (completion-inline '(:weight normal :foreground "#C0C0C0" :inherit hl-line)) ; Like Google.
+ (completion-other-candidates '(:weight bold :foreground "black" :background "#EBF4FE"))
+ (completion-selected-candidate '(:weight bold :foreground "white" :background "#0052A4"))
+ (diff-added '(:background "#DDFFDD"))
(diff-changed '(:foreground "#0000FF" :background "#DDDDFF"))
- (diff-header '(:foreground "#800000" :background "#FFFFAF"))
+ (diff-header '(:weight bold :foreground "#800000" :background "#FFFFAF"))
(diff-hunk-header '(:foreground "#990099" :background "#FFEEFF"))
- (diff-none '(:foreground "gray33"))
- (diff-removed '(:foreground "#A60000" :background "#FFDDDD"))
+ (diff-none '(:foreground "#888888"))
+ (diff-refine-added '(:background "#97F295"))
+ (diff-refine-removed '(:background "#FFB6BA"))
+ (diff-removed '(:background "#FEE8E9"))
(directory '(:weight bold :foreground "blue" :background "#FFFFD2"))
- (highlight-line '(:background "#FFFFD7")) ; #F5F5F5
- (highlight-line-gnus '(:background "#DAEAFC")) ; defined in `gnus-leuven.el'
+ (file '(:foreground "black"))
+ (function-param '(:foreground "#247284"))
+ (grep-file-name '(:weight bold :foreground "#2A489E")) ; Used for grep hits.
+ (grep-line-number '(:weight bold :foreground "#A535AE"))
+ (highlight-blue '(:background "#E6ECFF" :extend t))
+ (highlight-blue2 '(:background "#E4F1F9" :extend t))
+ (highlight-gray '(:background "#E4E4E3" :extend t))
+ (highlight-green '(:background "#D5F1CF" :extend t))
+ (highlight-red '(:background "#FFC8C8" :extend t))
+ (highlight-yellow '(:background "#F6FECD" :extend t))
(link '(:weight normal :underline t :foreground "#006DAF"))
+ (link-no-underline '(:weight normal :foreground "#006DAF"))
(mail-header-name '(:family "Sans Serif" :weight normal :foreground "#A3A3A2"))
(mail-header-other '(:family "Sans Serif" :slant normal :foreground "#666666"))
- (mail-read '(:weight normal :foreground "#86878B"))
- (mail-ticked '(:weight bold :background "#FBE6EF"))
+ (mail-read '(:foreground "#8C8C8C"))
+ (mail-read-high '(:foreground "#808080"))
+ (mail-ticked '(:foreground "#FF3300"))
(mail-to '(:family "Sans Serif" :underline nil :foreground "#006DAF"))
- (mail-unread '(:weight bold :foreground "black"))
- (marked-line '(:weight bold :foreground "white" :background "red"))
- (match '(:weight bold :background "#FBE448")) ; occur patterns
- (ol1 '(:height 1.3 :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0"))
- (ol2 '(:height 1.0 :weight bold :overline "#123555" :foreground "#123555" :background "#E5F4FB"))
- (ol3 '(:height 1.0 :weight bold :foreground "#005522" :background "#EFFFEF"))
- (ol4 '(:height 1.0 :weight bold :slant normal :foreground "#EA6300"))
- (ol5 '(:height 1.0 :weight bold :slant normal :foreground "#E3258D"))
- (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC"))
- (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C"))
- (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"))
+ (mail-unread '(:weight bold :foreground "#000000"))
+ (mail-unread-high '(:weight bold :foreground "#135985"))
+ (marked-line '(:foreground "#AA0000" :background "#FFAAAA"))
+ (match '(:weight bold :background "#FFFF00")) ; occur patterns + match in helm for files + match in Org files.
+ (ol1 `(,@(leuven-scale-font leuven-scale-outline-headlines 1.3) :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0" :extend t))
+ (ol2 '(:height 1.0 :weight bold :overline "#123555" :foreground "#123555" :background "#E5F4FB" :extend t))
+ (ol3 '(:height 1.0 :weight bold :foreground "#005522" :background "#EFFFEF" :extend t))
+ (ol4 '(:height 1.0 :weight bold :slant normal :foreground "#EA6300" :extend t))
+ (ol5 '(:height 1.0 :weight bold :slant normal :foreground "#E3258D" :extend t))
+ (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC" :extend t))
+ (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C" :extend t))
+ (ol8 '(:height 1.0 :weight bold :slant italic :foreground "#FD8008" :extend t))
+ (paren-matched '(:background "#C0E8C3")) ; Or take that green for region?
+ (paren-unmatched '(:weight bold :underline "red" :foreground "black" :background "#FFA5A5"))
+ (region '(:background "#8ED3FF" :extend t))
(shadow '(:foreground "#7F7F7F"))
(string '(:foreground "#008000")) ; or #D0372D
(subject '(:family "Sans Serif" :weight bold :foreground "black"))
- (symlink '(:foreground "deep sky blue"))
- (volatile-highlight '(:underline nil :background "#FFF876"))
- (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA")))
+ (symlink '(:foreground "#1F8DD6"))
+ (tab '(:foreground "#E8E8E8" :background "white"))
+ (trailing '(:foreground "#E8E8E8" :background "#FFFFAB"))
+ (volatile-highlight '(:underline nil :foreground "white" :background "#9E3699"))
+ (volatile-highlight-supersize '(:height 1.1 :underline nil :foreground "white" :background "#9E3699")) ; flash-region
+ (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA"))
+ (xml-attribute '(:foreground "#F36335"))
+ (xml-tag '(:foreground "#AE1B9A"))
+ (highlight-current-tag '(:background "#E8E8FF")) ; #EEF3F6 or #FFEB26
+ )
(custom-theme-set-faces
'leuven
@@ -91,45 +153,49 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(bold-italic ((,class (:weight bold :slant italic :foreground "black"))))
`(italic ((,class (:slant italic :foreground "#1A1A1A"))))
`(underline ((,class (:underline t))))
- `(cursor ((,class (:background "#0FB300"))))
+ `(cursor ((,class (:background "#21BDFF"))))
- ;; Highlighting faces
- `(fringe ((,class (:foreground "#9B9B9B" :background "#EDEDED"))))
- `(highlight ((,class ,volatile-highlight)))
+ ;; Lucid toolkit emacs menus.
+ `(menu ((,class (:foreground "#FFFFFF" :background "#333333"))))
+
+ ;; Highlighting faces.
+ `(fringe ((,class (:foreground "#4C9ED9" :background "white"))))
+ `(highlight ((,class ,highlight-blue)))
`(region ((,class ,region)))
- `(secondary-selection ((,class ,match))) ; used by Org-mode for highlighting matched entries and keywords
- `(isearch ((,class (:weight bold :underline "#FF9632" :foreground nil :background "#FDBD33"))))
- `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FF9999"))))
- `(lazy-highlight ((,class (:underline "#FF9632" :background "#FFFF00")))) ; isearch others
- `(trailing-whitespace ((,class (:background "#FFFF57"))))
- `(whitespace-hspace ((,class (:foreground "#D2D2D2"))))
- `(whitespace-indentation ((,class (:foreground "#A1A1A1" :background "white"))))
+ `(secondary-selection ((,class ,match))) ; Used by Org-mode for highlighting matched entries and keywords.
+ `(isearch ((,class (:underline "black" :foreground "white" :background "#5974AB"))))
+ `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FFCCCC"))))
+ `(lazy-highlight ((,class (:foreground "black" :background "#FFFF00")))) ; Isearch others (see `match').
+ `(trailing-whitespace ((,class ,trailing)))
+ `(query-replace ((,class (:inherit isearch))))
+ `(whitespace-hspace ((,class (:foreground "#D2D2D2")))) ; see also `nobreak-space'
+ `(whitespace-indentation ((,class ,tab)))
`(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88"))))
- `(whitespace-tab ((,class (:foreground "#A1A1A1" :background "white"))))
- `(whitespace-trailing ((,class (:foreground "#B3B3B3" :background "#FFFF57"))))
+ `(whitespace-tab ((,class ,tab)))
+ `(whitespace-trailing ((,class ,trailing)))
- ;; Mode line faces
+ ;; Mode line faces.
`(mode-line ((,class (:box (:line-width 1 :color "#1A2F54") :foreground "#85CEEB" :background "#335EA8"))))
`(mode-line-inactive ((,class (:box (:line-width 1 :color "#4E4E4C") :foreground "#F0F0EF" :background "#9B9C97"))))
`(mode-line-buffer-id ((,class (:weight bold :foreground "white"))))
`(mode-line-emphasis ((,class (:weight bold :foreground "white"))))
`(mode-line-highlight ((,class (:foreground "yellow"))))
- ;; Escape and prompt faces
+ ;; Escape and prompt faces.
`(minibuffer-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(minibuffer-noticeable-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(escape-glyph ((,class (:foreground "#008ED1"))))
- `(homoglyph ((,class (:foreground "#008ED1"))))
`(error ((,class (:foreground "red"))))
`(warning ((,class (:weight bold :foreground "orange"))))
`(success ((,class (:foreground "green"))))
- ;; Font lock faces
+ ;; Font lock faces.
`(font-lock-builtin-face ((,class (:foreground "#006FE0"))))
`(font-lock-comment-delimiter-face ((,class (:foreground "#8D8D84")))) ; #696969
`(font-lock-comment-face ((,class (:slant italic :foreground "#8D8D84")))) ; #696969
`(font-lock-constant-face ((,class (:foreground "#D0372D"))))
`(font-lock-doc-face ((,class (:foreground "#036A07"))))
+ ;; `(font-lock-doc-string-face ((,class (:foreground "#008000")))) ; XEmacs only, but is used for HTML exports from org2html (and not interactively)
`(font-lock-function-name-face ((,class (:weight normal :foreground "#006699"))))
`(font-lock-keyword-face ((,class (:bold nil :foreground "#0000FF")))) ; #3654DC
`(font-lock-preprocessor-face ((,class (:foreground "#808080"))))
@@ -140,32 +206,32 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(font-lock-variable-name-face ((,class (:weight normal :foreground "#BA36A5")))) ; #800080
`(font-lock-warning-face ((,class (:weight bold :foreground "red"))))
- ;; Button and link faces
+ ;; Button and link faces.
`(link ((,class ,link)))
`(link-visited ((,class (:underline t :foreground "#E5786D"))))
`(button ((,class (:underline t :foreground "#006DAF"))))
- `(header-line ((,class (:weight bold :underline "black" :overline "black" :foreground "black" :background "#FFFF88"))))
+ `(header-line ((,class (:box (:line-width 1 :color "black") :foreground "black" :background "#F0F0F0"))))
- ;; Gnus faces
+ ;; Gnus faces.
`(gnus-button ((,class (:weight normal))))
`(gnus-cite-attribution-face ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-1 ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-10 ((,class (:foreground "#990000"))))
- `(gnus-cite-face-2 ((,class (:foreground "#660066"))))
- `(gnus-cite-face-3 ((,class (:foreground "#007777"))))
- `(gnus-cite-face-4 ((,class (:foreground "#990000"))))
- `(gnus-cite-face-5 ((,class (:foreground "#000099"))))
- `(gnus-cite-face-6 ((,class (:foreground "#BB6600"))))
- `(gnus-cite-face-7 ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-8 ((,class (:foreground "#660066"))))
- `(gnus-cite-face-9 ((,class (:foreground "#007777"))))
+ `(gnus-cite-1 ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
+ `(gnus-cite-2 ((,class (:foreground "#660066" :background "#F6F6F6"))))
+ `(gnus-cite-3 ((,class (:foreground "#007777" :background "#F6F6F6"))))
+ `(gnus-cite-4 ((,class (:foreground "#990000" :background "#F6F6F6"))))
+ `(gnus-cite-5 ((,class (:foreground "#000099" :background "#F6F6F6"))))
+ `(gnus-cite-6 ((,class (:foreground "#BB6600" :background "#F6F6F6"))))
+ `(gnus-cite-7 ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
+ `(gnus-cite-8 ((,class (:foreground "#660066" :background "#F6F6F6"))))
+ `(gnus-cite-9 ((,class (:foreground "#007777" :background "#F6F6F6"))))
+ `(gnus-cite-10 ((,class (:foreground "#990000" :background "#F6F6F6"))))
`(gnus-emphasis-bold ((,class (:weight bold))))
`(gnus-emphasis-highlight-words ((,class (:foreground "yellow" :background "black"))))
`(gnus-group-mail-1 ((,class (:weight bold :foreground "#FF50B0"))))
`(gnus-group-mail-1-empty ((,class (:foreground "#5050B0"))))
`(gnus-group-mail-2 ((,class (:weight bold :foreground "#FF0066"))))
`(gnus-group-mail-2-empty ((,class (:foreground "#660066"))))
- `(gnus-group-mail-3 ((,class (:weight bold :foreground "black"))))
+ `(gnus-group-mail-3 ((,class ,mail-unread)))
`(gnus-group-mail-3-empty ((,class ,mail-read)))
`(gnus-group-mail-low ((,class ,cancel)))
`(gnus-group-mail-low-empty ((,class ,cancel)))
@@ -173,8 +239,8 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-group-news-1-empty ((,class (:foreground "#5050B0"))))
`(gnus-group-news-2 ((,class (:weight bold :foreground "#FF0066"))))
`(gnus-group-news-2-empty ((,class (:foreground "#660066"))))
- `(gnus-group-news-3 ((,class (:weight bold :foreground "black"))))
- `(gnus-group-news-3-empty ((,class (:foreground "#808080"))))
+ `(gnus-group-news-3 ((,class ,mail-unread)))
+ `(gnus-group-news-3-empty ((,class ,mail-read)))
`(gnus-group-news-4 ((,class (:weight bold :foreground "#FF0000"))))
`(gnus-group-news-4-empty ((,class (:foreground "#990000"))))
`(gnus-group-news-5 ((,class (:weight bold :foreground "#FF0099"))))
@@ -194,11 +260,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-signature ((,class (:slant italic :foreground "#8B8D8E"))))
`(gnus-splash ((,class (:foreground "#FF8C00"))))
`(gnus-summary-cancelled ((,class ,cancel)))
- `(gnus-summary-high-ancient ((,class (:weight normal :foreground "#808080" :background "#FFFFE6"))))
- `(gnus-summary-high-read ((,class (:weight normal :foreground "#999999" :background "#FFFFE6"))))
+ `(gnus-summary-high-ancient ((,class ,mail-unread-high)))
+ `(gnus-summary-high-read ((,class ,mail-read-high)))
`(gnus-summary-high-ticked ((,class ,mail-ticked)))
- `(gnus-summary-high-unread ((,class (:weight bold :foreground "black" :background "#FFFFCC"))))
- `(gnus-summary-low-ancient ((,class (:slant italic :foreground "gray55"))))
+ `(gnus-summary-high-unread ((,class ,mail-unread-high)))
+ `(gnus-summary-low-ancient ((,class (:slant italic :foreground "black"))))
`(gnus-summary-low-read ((,class (:slant italic :foreground "#999999" :background "#E0E0E0"))))
`(gnus-summary-low-ticked ((,class ,mail-ticked)))
`(gnus-summary-low-unread ((,class (:slant italic :foreground "black"))))
@@ -209,82 +275,105 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-summary-selected ((,class (:foreground "white" :background "#008CD7"))))
`(gnus-x-face ((,class (:foreground "black" :background "white"))))
- ;; Message faces
+ ;; Message faces.
`(message-header-name ((,class ,mail-header-name)))
`(message-header-cc ((,class ,mail-to)))
`(message-header-other ((,class ,mail-header-other)))
`(message-header-subject ((,class ,subject)))
`(message-header-to ((,class ,mail-to)))
- `(message-cited-text ((,class (:foreground "#5050B0"))))
+ `(message-cited-text ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
`(message-separator ((,class (:family "Sans Serif" :weight normal :foreground "#BDC2C6"))))
`(message-header-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC"))))
`(message-header-xheader ((,class ,mail-header-other)))
`(message-mml ((,class (:foreground "forest green"))))
- ;; Diff
+ ;; Diff.
`(diff-added ((,class ,diff-added)))
`(diff-changed ((,class ,diff-changed)))
`(diff-context ((,class ,diff-none)))
`(diff-file-header ((,class ,diff-header)))
`(diff-file1-hunk-header ((,class (:foreground "dark magenta" :background "#EAF2F5"))))
`(diff-file2-hunk-header ((,class (:foreground "#2B7E2A" :background "#EAF2F5"))))
- `(diff-function ((,class (:foreground "darkgray"))))
+ `(diff-function ((,class (:foreground "#CC99CC"))))
`(diff-header ((,class ,diff-header)))
`(diff-hunk-header ((,class ,diff-hunk-header)))
`(diff-index ((,class ,diff-header)))
- `(diff-indicator-added ((,class (:background "#AAFFAA"))))
- `(diff-indicator-changed ((,class (:background "#8080FF"))))
- `(diff-indicator-removed ((,class (:background "#FFBBBB"))))
+ `(diff-indicator-added ((,class (:foreground "#3A993A" :background "#CDFFD8"))))
+ `(diff-indicator-changed ((,class (:background "#DBEDFF"))))
+ `(diff-indicator-removed ((,class (:foreground "#CC3333" :background "#FFDCE0"))))
+ `(diff-refine-added ((,class ,diff-refine-added)))
`(diff-refine-change ((,class (:background "#DDDDFF"))))
+ `(diff-refine-removed ((,class ,diff-refine-removed)))
`(diff-removed ((,class ,diff-removed)))
- ;; SMerge
+ ;; SMerge.
+ `(smerge-mine ((,class ,diff-changed)))
+ `(smerge-other ((,class ,diff-added)))
+ `(smerge-base ((,class ,diff-removed)))
+ `(smerge-markers ((,class (:background "#FFE5CC"))))
`(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-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.
+ `(ediff-current-diff-A ((,class (:background "#FFDDDD" :extend t))))
+ `(ediff-current-diff-B ((,class (:background "#DDFFDD" :extend t))))
+ `(ediff-current-diff-C ((,class (:background "cyan" :extend t))))
+ `(ediff-even-diff-A ((,class (:background "light grey" :extend t))))
+ `(ediff-even-diff-B ((,class (:background "light grey" :extend t))))
+ `(ediff-fine-diff-A ((,class (:background "#FFAAAA" :extend t))))
+ `(ediff-fine-diff-B ((,class (:background "#55FF55" :extend t))))
+ `(ediff-odd-diff-A ((,class (:background "light grey" :extend t))))
+ `(ediff-odd-diff-B ((,class (:background "light grey" :extend t))))
- ;; Flyspell
-;; (when (version< emacs-version "24.XXX")
- `(flyspell-duplicate ((,class (:underline "#008000" :inherit nil))))
- `(flyspell-incorrect ((,class (:underline "red" :inherit nil))))
-;; `(flyspell-duplicate ((,class (:underline (:style wave :color "#008000") :inherit nil))))
-;; `(flyspell-incorrect ((,class (:underline (:style wave :color "red") :inherit nil))))
+ ;; Flyspell.
+ (if (version< emacs-version "24.4")
+ `(flyspell-duplicate ((,class (:underline "#F4EB80" :inherit nil))))
+ `(flyspell-duplicate ((,class (:underline (:style wave :color "#F4EB80") :background "#FAF7CC" :inherit nil)))))
+ (if (version< emacs-version "24.4")
+ `(flyspell-incorrect ((,class (:underline "#FAA7A5" :inherit nil))))
+ `(flyspell-incorrect ((,class (:underline (:style wave :color "#FAA7A5") :background "#F4D7DA":inherit nil)))))
- ;; ;; Semantic faces
+ ;; ;; Semantic faces.
;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4))))
;; `(semantic-decoration-on-private-members-face ((,class (:background ,alum-2))))
;; `(semantic-decoration-on-protected-members-face ((,class (:background ,alum-2))))
- ;; `(semantic-decoration-on-unknown-includes ((,class (:background ,choc-3))))
+ `(semantic-decoration-on-unknown-includes ((,class (:background "#FFF8F8"))))
;; `(semantic-decoration-on-unparsed-includes ((,class (:underline ,orange-3))))
- ;; `(semantic-tag-boundary-face ((,class (:overline ,blue-1))))
+ `(semantic-highlight-func-current-tag-face ((,class ,highlight-current-tag)))
+ `(semantic-tag-boundary-face ((,class (:overline "#777777")))) ; Method separator.
;; `(semantic-unmatched-syntax-face ((,class (:underline ,red-1))))
`(Info-title-1-face ((,class ,ol1)))
`(Info-title-2-face ((,class ,ol2)))
`(Info-title-3-face ((,class ,ol3)))
`(Info-title-4-face ((,class ,ol4)))
- `(ac-completion-face ((,class (:underline nil :foreground "#C0C0C0")))) ; like Google
- `(ace-jump-face-foreground ((,class (:foreground "black" :background "#FBE448"))))
+ `(ace-jump-face-foreground ((,class (:weight bold :foreground "black" :background "#FEA500"))))
+ `(ahs-face ((,class (:background "#E4E4FF"))))
+ `(ahs-definition-face ((,class (:background "#FFB6C6"))))
+ `(ahs-plugin-defalt-face ((,class (:background "#FFE4FF")))) ; Current.
+ `(anzu-match-1 ((,class (:foreground "black" :background "aquamarine"))))
+ `(anzu-match-2 ((,class (:foreground "black" :background "springgreen"))))
+ `(anzu-match-3 ((,class (:foreground "black" :background "red"))))
+ `(anzu-mode-line ((,class (:foreground "black" :background "#80FF80"))))
+ `(anzu-mode-line-no-match ((,class (:foreground "black" :background "#FF8080"))))
+ `(anzu-replace-highlight ((,class (:inherit query-replace))))
+ `(anzu-replace-to ((,class (:weight bold :foreground "#BD33FD" :background "#FDBD33"))))
`(auto-dim-other-buffers-face ((,class (:background "#F7F7F7"))))
+ `(avy-background-face ((,class (:background "#A9A9A9"))))
+ `(avy-lead-face ((,class (:weight bold :foreground "black" :background "#FEA500"))))
`(bbdb-company ((,class (:slant italic :foreground "steel blue"))))
`(bbdb-field-name ((,class (:weight bold :foreground "steel blue"))))
`(bbdb-field-value ((,class (:foreground "steel blue"))))
`(bbdb-name ((,class (:underline t :foreground "#FF6633"))))
- `(bmkp-light-autonamed ((,class (:background "#C2DDFD"))))
- `(bmkp-light-fringe-autonamed ((,class (:background "#90AFD5"))))
- `(bmkp-light-fringe-non-autonamed ((,class (:background "#D5FFD5"))))
- `(bmkp-light-non-autonamed ((,class (:background "#C4FFC4"))))
- `(browse-kill-ring-separator-face ((,class (:weight bold :foreground "slate gray"))))
+ `(bmkp-light-autonamed ((,class (:background "#F0F0F0"))))
+ `(bmkp-light-fringe-autonamed ((,class (:foreground "#5A5A5A" :background "#D4D4D4"))))
+ `(bmkp-light-fringe-non-autonamed ((,class (:foreground "#FFFFCC" :background "#01FFFB")))) ; default
+ `(bmkp-light-non-autonamed ((,class (:background "#BFFFFE"))))
+ `(bmkp-no-local ((,class (:background "pink"))))
+ `(browse-kill-ring-separator-face ((,class (:foreground "red"))))
+ `(calendar-month-header ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
`(calendar-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(calendar-weekday-header ((,class (:weight bold :foreground "#1662AF"))))
+ `(calendar-weekend-header ((,class (:weight bold :foreground "#4E4E4E"))))
`(cfw:face-annotation ((,class (:foreground "green" :background "red"))))
`(cfw:face-day-title ((,class (:foreground "#C9C9C9"))))
`(cfw:face-default-content ((,class (:foreground "#2952A3"))))
@@ -299,12 +388,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(cfw:face-sunday ((,class (:foreground "#4E4E4E" :background "white" :weight bold))))
`(cfw:face-title ((,class (:height 2.0 :foreground "#676767" :weight bold :inherit variable-pitch))))
`(cfw:face-today ((,class (:foreground "#4F4A3D" :background "#FFFFCC"))))
- `(cfw:face-today-title ((,class (:foreground "#4A95EB" :background "#FFFFCC"))))
+ `(cfw:face-today-title ((,class (:foreground "white" :background "#1766B1"))))
`(cfw:face-toolbar ((,class (:background "white"))))
`(cfw:face-toolbar-button-off ((,class (:foreground "#CFCFCF" :background "white"))))
`(cfw:face-toolbar-button-on ((,class (:foreground "#5E5E5E" :background "#F6F6F6"))))
- `(change-log-date-face ((,class (:foreground "purple"))))
+ `(change-log-date ((,class (:foreground "purple"))))
`(change-log-file ((,class (:weight bold :foreground "#4183C4"))))
+ `(change-log-list ((,class (:foreground "black" :background "#75EEC7"))))
+ `(change-log-name ((,class (:foreground "#008000"))))
`(circe-highlight-all-nicks-face ((,class (:foreground "blue" :background "#F0F0F0")))) ; other nick names
`(circe-highlight-nick-face ((,class (:foreground "#009300" :background "#F0F0F0")))) ; messages with my nick cited
`(circe-my-message-face ((,class (:foreground "#8B8B8B" :background "#F0F0F0"))))
@@ -314,15 +405,38 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(comint-highlight-input ((,class (:weight bold :foreground "#0000FF" :inherit nil))))
;; `(comint-highlight-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(comint-highlight-prompt ((,class (:weight bold :foreground "#0000FF" :inherit nil))))
- `(company-preview-common ((,class (:foreground "#C0C0C0" :background "#FFFFD7")))) ; same background as highlight-line
- `(company-tooltip-annotation ((,class (:foreground "#999999" :background "cornsilk"))))
- `(company-tooltip-common ((,class (:weight bold :inherit company-tooltip))))
- `(company-tooltip-common-selection ((,class (:weight bold :inherit company-tooltip-selection))))
+
+ ;; `(ac-selection-face ((,class ,completion-selected-candidate)))
+ `(ac-selection-face ((,class (:weight bold :foreground "white" :background "orange")))) ; TEMP For diff'ing AC from Comp.
+ `(ac-candidate-face ((,class ,completion-other-candidates)))
+ `(ac-completion-face ((,class ,completion-inline)))
+ `(ac-candidate-mouse-face ((,class (:inherit highlight))))
+ `(popup-scroll-bar-background-face ((,class (:background "#EBF4FE"))))
+ `(popup-scroll-bar-foreground-face ((,class (:background "#D1DAE4")))) ; Scrollbar (visible).
+
+ `(company-tooltip-common-selection ((,class (:weight normal :foreground "#F9ECCC" :inherit company-tooltip-selection)))) ; Prefix + common part in tooltip (for selection).
+ `(company-tooltip-selection ((,class ,completion-selected-candidate))) ; Suffix in tooltip (for selection).
+ `(company-tooltip-annotation-selection ((,class (:weight normal :foreground "#F9ECCC")))) ; Annotation (for selection).
+
+ `(company-tooltip-common ((,class (:weight normal :foreground "#B000B0" :inherit company-tooltip)))) ; Prefix + common part in tooltip.
+ `(company-tooltip ((,class ,completion-other-candidates))) ; Suffix in tooltip.
+ `(company-tooltip-annotation ((,class (:weight normal :foreground "#2415FF")))) ; Annotation.
+
+ `(company-preview-common ((,class ,completion-inline)))
+
+ `(company-scrollbar-bg ((,class (:background "#EBF4FE"))))
+ `(company-scrollbar-fg ((,class (:background "#D1DAE4")))) ; Scrollbar (visible).
+
`(compare-windows ((,class (:background "#FFFF00"))))
- `(compilation-error ((,class (:weight bold :foreground "red"))))
- `(compilation-info ((,class (:weight bold :foreground "#2A489E")))) ; used for grep
- `(compilation-line-number ((,class (:weight bold :foreground "#A535AE"))))
+ ;; `(completions-common-part ((,class (:foreground "red" :weight bold))))
+ ;; `(completions-first-difference ((,class (:foreground "green" :weight bold))))
+ `(compilation-error ((,class (:weight bold :foreground "red")))) ; Used for grep error messages.
+ `(compilation-info ((,class ,grep-file-name)))
+ `(compilation-line-number ((,class ,grep-line-number)))
`(compilation-warning ((,class (:weight bold :foreground "orange"))))
+ `(compilation-mode-line-exit ((,class (:weight bold :foreground "green")))) ; :exit[matched]
+ `(compilation-mode-line-fail ((,class (:weight bold :foreground "violet")))) ; :exit[no match]
+ `(compilation-mode-line-run ((,class (:weight bold :foreground "orange")))) ; :run
`(css-property ((,class (:foreground "#00AA00"))))
`(css-selector ((,class (:weight bold :foreground "blue"))))
`(custom-button ((,class (:box (:line-width 2 :style released-button) :foreground "black" :background "lightgrey"))))
@@ -348,11 +462,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(custom-variable-button ((,class (:weight bold :underline t))))
`(custom-variable-tag ((,class (:family "Sans Serif" :height 1.2 :weight bold :foreground "blue1"))))
`(custom-visibility ((,class ,link)))
- `(diff-hl-change ((,class (:foreground "blue3" :inherit diff-changed))))
- `(diff-hl-delete ((,class (:foreground "red3" :inherit diff-removed))))
- `(diff-hl-dired-change ((,class (:background "#FFA335" :foreground "black" :weight bold))))
+ `(diff-hl-change ((,class (:foreground "blue3" :background "#DBEDFF"))))
+ `(diff-hl-delete ((,class (:foreground "red3" :background "#FFDCE0"))))
+ `(diff-hl-dired-change ((,class (:weight bold :foreground "black" :background "#FFA335"))))
+ `(diff-hl-dired-delete ((,class (:weight bold :foreground "#D73915"))))
+ `(diff-hl-dired-ignored ((,class (:weight bold :foreground "white" :background "#C0BBAB"))))
+ `(diff-hl-dired-insert ((,class (:weight bold :foreground "#B9B9BA"))))
`(diff-hl-dired-unknown ((,class (:foreground "white" :background "#3F3BB4"))))
- `(diff-hl-insert ((,class (:foreground "green4" :inherit diff-added))))
+ `(diff-hl-insert ((,class (:foreground "green4" :background "#CDFFD8"))))
`(diff-hl-unknown ((,class (:foreground "white" :background "#3F3BB4"))))
`(diary-face ((,class (:foreground "#87C9FC"))))
`(dircolors-face-asm ((,class (:foreground "black"))))
@@ -385,17 +502,36 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(diredp-compressed-file-suffix ((,class (:foreground "red"))))
`(diredp-date-time ((,class (:foreground "purple"))))
`(diredp-dir-heading ((,class ,directory)))
+ `(diredp-dir-name ((,class ,directory)))
`(diredp-dir-priv ((,class ,directory)))
`(diredp-exec-priv ((,class (:background "#03C03C"))))
`(diredp-executable-tag ((,class (:foreground "ForestGreen" :background "white"))))
- `(diredp-file-name ((,class (:foreground "black"))))
+ `(diredp-file-name ((,class ,file)))
`(diredp-file-suffix ((,class (:foreground "#C0C0C0"))))
`(diredp-flag-mark-line ((,class ,marked-line)))
`(diredp-ignored-file-name ((,class ,shadow)))
`(diredp-read-priv ((,class (:background "#0A99FF"))))
`(diredp-write-priv ((,class (:foreground "white" :background "#FF4040"))))
+ `(eldoc-highlight-function-argument ((,class (:weight bold :foreground "red" :background "#FFE4FF"))))
+ `(elfeed-search-filter-face ((,class (:foreground "gray"))))
+ ;; `(eww-form-checkbox ((,class ())))
+ ;; `(eww-form-select ((,class ())))
+ ;; `(eww-form-submit ((,class ())))
+ `(eww-form-text ((,class (:weight bold :foreground "#40586F" :background "#A7CDF1"))))
+ ;; `(eww-form-textarea ((,class ())))
`(file-name-shadow ((,class ,shadow)))
+ `(flycheck-error ((,class (:underline (:color "#FE251E" :style wave) :weight bold :background "#FFE1E1"))))
+ `(flycheck-error-list-line-number ((,class (:foreground "#A535AE"))))
+ `(flycheck-fringe-error ((,class (:foreground "#FE251E"))))
+ `(flycheck-fringe-info ((,class (:foreground "#158A15"))))
+ `(flycheck-fringe-warning ((,class (:foreground "#F4A939"))))
+ `(flycheck-info ((,class (:underline (:color "#158A15" :style wave) :weight bold))))
+ `(flycheck-warning ((,class (:underline (:color "#F4A939" :style wave) :weight bold :background "#FFFFBE"))))
`(font-latex-bold-face ((,class (:weight bold :foreground "black"))))
+ `(fancy-narrow-blocked-face ((,class (:foreground "#9998A4"))))
+ `(flycheck-color-mode-line-error-face ((, class (:background "#CF5B56"))))
+ `(flycheck-color-mode-line-warning-face ((, class (:background "#EBC700"))))
+ `(flycheck-color-mode-line-info-face ((, class (:background "yellow"))))
`(font-latex-italic-face ((,class (:slant italic :foreground "#1A1A1A"))))
`(font-latex-math-face ((,class (:foreground "blue"))))
`(font-latex-sectioning-1-face ((,class (:family "Sans Serif" :height 2.7 :weight bold :foreground "cornflower blue"))))
@@ -408,36 +544,65 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(font-latex-verbatim-face ((,class (:foreground "#000088" :background "#FFFFE0" :inherit nil))))
`(git-commit-summary-face ((,class (:foreground "#000000"))))
`(git-commit-comment-face ((,class (:slant italic :foreground "#696969"))))
+ `(git-timemachine-commit ((,class ,diff-removed)))
+ `(git-timemachine-minibuffer-author-face ((,class ,diff-added)))
+ `(git-timemachine-minibuffer-detail-face ((,class ,diff-header)))
+ `(google-translate-text-face ((,class (:foreground "#777777" :background "#F5F5F5"))))
+ `(google-translate-phonetic-face ((,class (:inherit shadow))))
+ `(google-translate-translation-face ((,class (:weight normal :foreground "#3079ED" :background "#E3EAF2"))))
+ `(google-translate-suggestion-label-face ((,class (:foreground "red"))))
+ `(google-translate-suggestion-face ((,class (:slant italic :underline t))))
+ `(google-translate-listen-button-face ((,class (:height 0.8))))
`(helm-action ((,class (:foreground "black"))))
+ `(helm-bookmark-file ((,class ,file)))
`(helm-bookmarks-su-face ((,class (:foreground "red"))))
+ `(helm-buffer-directory ((,class ,directory)))
+ ;; `(helm-non-file-buffer ((,class (:slant italic :foreground "blue"))))
+ ;; `(helm-buffer-file ((,class (:foreground "#333333"))))
+ `(helm-buffer-modified ((,class (:slant italic :foreground "#BA36A5"))))
`(helm-buffer-process ((,class (:foreground "#008200"))))
`(helm-candidate-number ((,class (:foreground "black" :background "#FFFF66"))))
`(helm-dir-heading ((,class (:foreground "blue" :background "pink"))))
`(helm-dir-priv ((,class (:foreground "dark red" :background "light grey"))))
`(helm-ff-directory ((,class ,directory)))
+ `(helm-ff-dotted-directory ((,class ,directory)))
`(helm-ff-executable ((,class (:foreground "green3" :background "white"))))
`(helm-ff-file ((,class (:foreground "black"))))
`(helm-ff-invalid-symlink ((,class (:foreground "yellow" :background "red"))))
`(helm-ff-symlink ((,class ,symlink)))
`(helm-file-name ((,class (:foreground "blue"))))
`(helm-gentoo-match-face ((,class (:foreground "red"))))
+ `(helm-grep-file ((,class ,grep-file-name)))
+ `(helm-grep-lineno ((,class ,grep-line-number)))
`(helm-grep-match ((,class ,match)))
`(helm-grep-running ((,class (:weight bold :foreground "white"))))
- `(helm-grep-lineno ((,class ,shadow)))
`(helm-isearch-match ((,class (:background "#CCFFCC"))))
+ `(helm-lisp-show-completion ((,class ,volatile-highlight-supersize))) ; See `helm-dabbrev'.
+ ;; `(helm-ls-git-added-copied-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-added-modified-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-conflict-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-deleted-and-staged-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-deleted-not-staged-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-modified-and-staged-face ((,class (:foreground ""))))
+ `(helm-ls-git-modified-not-staged-face ((,class (:foreground "#BA36A5"))))
+ ;; `(helm-ls-git-renamed-modified-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-untracked-face ((,class (:foreground ""))))
`(helm-match ((,class ,match)))
`(helm-moccur-buffer ((,class (:foreground "#0066CC"))))
- `(helm-selection ((,class ,volatile-highlight)))
- `(helm-selection-line ((,class ,volatile-highlight)))
- `(helm-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#2F69BF"))))
- `(helm-swoop-target-line-face ((,class ,volatile-highlight)))
+ `(helm-selection ((,class (:background "#3875D6" :foreground "white"))))
+ `(helm-selection-line ((,class ,highlight-gray))) ; ???
+ `(helm-separator ((,class (:foreground "red"))))
+ `(helm-source-header ((,class (:weight bold :box (:line-width 1 :color "#C7C7C7") :background "#DEDEDE" :foreground "black"))))
`(helm-swoop-target-line-block-face ((,class (:background "#CCCC00" :foreground "#222222"))))
+ `(helm-swoop-target-line-face ((,class (:background "#CCCCFF"))))
`(helm-swoop-target-word-face ((,class (:weight bold :foreground nil :background "#FDBD33"))))
`(helm-visible-mark ((,class ,marked-line)))
`(helm-w3m-bookmarks-face ((,class (:underline t :foreground "cyan1"))))
+ `(highlight-changes ((,class (:foreground nil)))) ;; blue "#2E08B5"
+ `(highlight-changes-delete ((,class (:strike-through nil :foreground nil)))) ;; red "#B5082E"
`(highlight-symbol-face ((,class (:background "#FFFFA0"))))
- `(hl-line ((,class ,highlight-line)))
- `(hl-tags-face ((,class (:background "#FEFCAE"))))
+ `(hl-line ((,class ,highlight-yellow))) ; Highlight current line.
+ `(hl-tags-face ((,class ,highlight-current-tag))) ; ~ Pair highlighting (matching tags).
`(holiday-face ((,class (:foreground "#777777" :background "#E4EBFE"))))
`(html-helper-bold-face ((,class (:weight bold :foreground "black"))))
`(html-helper-italic-face ((,class (:slant italic :foreground "black"))))
@@ -448,9 +613,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(ilog-echo-face ((,class (:height 2.0 :foreground "#006FE0"))))
`(ilog-load-face ((,class (:foreground "#BA36A5"))))
`(ilog-message-face ((,class (:foreground "#808080"))))
+ `(indent-guide-face ((,class (:foreground "#D3D3D3"))))
`(info-file ((,class (:family "Sans Serif" :height 1.8 :weight bold :box (:line-width 1 :color "#0000CC") :foreground "cornflower blue" :background "LightSteelBlue1"))))
`(info-header-node ((,class (:underline t :foreground "orange")))) ; nodes in header
`(info-header-xref ((,class (:underline t :foreground "dodger blue")))) ; cross references in header
+ `(info-index-match ((,class (:weight bold :foreground nil :background "#FDBD33")))) ; when using `i'
`(info-menu-header ((,class ,ol2))) ; menu titles (headers) -- major topics
`(info-menu-star ((,class (:foreground "black")))) ; every 3rd menu item
`(info-node ((,class (:underline t :foreground "blue")))) ; node names
@@ -459,16 +626,48 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(info-title-1 ((,class ,ol1)))
`(info-xref ((,class (:underline t :foreground "#006DAF")))) ; unvisited cross-references
`(info-xref-visited ((,class (:underline t :foreground "magenta4")))) ; previously visited cross-references
+ ;; js2-highlight-vars-face (~ auto-highlight-symbol)
+ `(js2-error ((,class (:box (:line-width 1 :color "#FF3737") :background "#FFC8C8")))) ; DONE.
+ `(js2-external-variable ((,class (:foreground "#FF0000" :background "#FFF8F8")))) ; DONE.
+ `(js2-function-param ((,class ,function-param)))
+ `(js2-instance-member ((,class (:foreground "DarkOrchid"))))
+ `(js2-jsdoc-html-tag-delimiter ((,class (:foreground "#D0372D"))))
+ `(js2-jsdoc-html-tag-name ((,class (:foreground "#D0372D"))))
+ `(js2-jsdoc-tag ((,class (:weight normal :foreground "#6434A3"))))
+ `(js2-jsdoc-type ((,class (:foreground "SteelBlue"))))
+ `(js2-jsdoc-value ((,class (:weight normal :foreground "#BA36A5")))) ; #800080
+ `(js2-magic-paren ((,class (:underline t))))
+ `(js2-private-function-call ((,class (:foreground "goldenrod"))))
+ `(js2-private-member ((,class (:foreground "PeachPuff3"))))
+ `(js2-warning ((,class (:underline "orange"))))
+
+ ;; Org non-standard faces.
+ `(leuven-org-deadline-overdue ((,class (:foreground "#F22659"))))
+ `(leuven-org-deadline-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(leuven-org-deadline-tomorrow ((,class (:foreground "#40A80B"))))
+ `(leuven-org-deadline-future ((,class (:foreground "#40A80B"))))
+ `(leuven-gnus-unseen ((,class (:weight bold :foreground "#FC7202"))))
+ `(leuven-gnus-date ((,class (:foreground "#FF80BF"))))
+ `(leuven-gnus-size ((,class (:foreground "#8FBF60"))))
+ `(leuven-todo-items-face ((,class (:weight bold :foreground "#FF3125" :background "#FFFF88"))))
+
`(light-symbol-face ((,class (:background "#FFFFA0"))))
- `(linum ((,class (:inherit (default shadow) :foreground "#9A9A9A" :background "#EDEDED"))))
+ `(linum ((,class (:foreground "#9A9A9A" :background "#EDEDED"))))
`(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
+ `(log-view-message ((,class (:foreground "black" :background "#EDEA74"))))
`(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"))))
+ `(magit-blame-header ((,class (:inherit magit-diff-file-header))))
+ `(magit-blame-heading ((,class (:overline "#A7A7A7" :foreground "red" :background "#E6E6E6"))))
+ `(magit-blame-hash ((,class (:overline "#A7A7A7" :foreground "red" :background "#E6E6E6"))))
+ `(magit-blame-name ((,class (:overline "#A7A7A7" :foreground "#036A07" :background "#E6E6E6"))))
+ `(magit-blame-date ((,class (:overline "#A7A7A7" :foreground "blue" :background "#E6E6E6"))))
+ `(magit-blame-summary ((,class (:overline "#A7A7A7" :weight bold :foreground "#707070" :background "#E6E6E6"))))
`(magit-branch ((,class ,vc-branch)))
`(magit-diff-add ((,class ,diff-added)))
`(magit-diff-del ((,class ,diff-removed)))
- `(magit-diff-file-header ((,class (:family "Sans Serif" :height 1.1 :weight bold :foreground "#4183C4"))))
+ `(magit-diff-file-header ((,class (:height 1.1 :weight bold :foreground "#4183C4"))))
`(magit-diff-hunk-header ((,class ,diff-hunk-header)))
`(magit-diff-none ((,class ,diff-none)))
`(magit-header ((,class (:foreground "white" :background "#FF4040"))))
@@ -479,45 +678,78 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(magit-section-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "cornflower blue" :inherit nil))))
`(makefile-space-face ((,class (:background "hot pink"))))
`(makefile-targets ((,class (:weight bold :foreground "blue"))))
- `(match ((,class ,match)))
+ ;; `(markdown-blockquote-face ((,class ())))
+ `(markdown-bold-face ((,class (:inherit bold))))
+ ;; `(markdown-comment-face ((,class ())))
+ ;; `(markdown-footnote-face ((,class ())))
+ ;; `(markdown-header-delimiter-face ((,class ())))
+ ;; `(markdown-header-face ((,class ())))
+ `(markdown-header-face-1 ((,class ,ol1)))
+ `(markdown-header-face-2 ((,class ,ol2)))
+ `(markdown-header-face-3 ((,class ,ol3)))
+ `(markdown-header-face-4 ((,class ,ol4)))
+ `(markdown-header-face-5 ((,class ,ol5)))
+ `(markdown-header-face-6 ((,class ,ol6)))
+ ;; `(markdown-header-rule-face ((,class ())))
+ `(markdown-inline-code-face ((,class ,code-inline)))
+ `(markdown-italic-face ((,class (:inherit italic))))
+ `(markdown-language-keyword-face ((,class (:inherit org-block-begin-line))))
+ ;; `(markdown-line-break-face ((,class ())))
+ `(markdown-link-face ((,class ,link-no-underline)))
+ ;; `(markdown-link-title-face ((,class ())))
+ ;; `(markdown-list-face ((,class ())))
+ ;; `(markdown-math-face ((,class ())))
+ ;; `(markdown-metadata-key-face ((,class ())))
+ ;; `(markdown-metadata-value-face ((,class ())))
+ ;; `(markdown-missing-link-face ((,class ())))
+ `(markdown-pre-face ((,class (:inherit org-block-background))))
+ ;; `(markdown-reference-face ((,class ())))
+ ;; `(markdown-strike-through-face ((,class ())))
+ `(markdown-url-face ((,class ,link)))
+ `(match ((,class ,match))) ; Used for grep matches.
+ `(mc/cursor-bar-face ((,class (:height 1.0 :foreground "#1664C4" :background "#1664C4"))))
+ `(mc/cursor-face ((,class (:inverse-video t))))
+ `(mc/region-face ((,class (:inherit region))))
`(mm-uu-extract ((,class ,code-block)))
`(moccur-current-line-face ((,class (:foreground "black" :background "#FFFFCC"))))
`(moccur-face ((,class (:foreground "black" :background "#FFFF99"))))
- `(next-error ((,class ,volatile-highlight)))
+ `(next-error ((,class ,volatile-highlight-supersize)))
`(nobreak-space ((,class (:background "#CCE8F6"))))
- `(nxml-attribute-local-name-face ((,class (:foreground "magenta"))))
+ `(nxml-attribute-local-name-face ((,class ,xml-attribute)))
`(nxml-attribute-value-delimiter-face ((,class (:foreground "green4"))))
`(nxml-attribute-value-face ((,class (:foreground "green4"))))
`(nxml-comment-content-face ((,class (:slant italic :foreground "red"))))
`(nxml-comment-delimiter-face ((,class (:foreground "red"))))
- `(nxml-element-local-name ((,class (:box (:line-width 1 :color "#999999") :foreground "#000088" :background "#DEDEDE"))))
+ `(nxml-element-local-name ((,class ,xml-tag)))
`(nxml-element-local-name-face ((,class (:foreground "blue"))))
`(nxml-processing-instruction-target-face ((,class (:foreground "purple1"))))
`(nxml-tag-delimiter-face ((,class (:foreground "blue"))))
`(nxml-tag-slash-face ((,class (:foreground "blue"))))
`(org-agenda-block-count ((,class (:weight bold :foreground "#A5A5A5"))))
- `(org-agenda-calendar-event ((,class (:weight bold :foreground "#3774CC" :background "#A8C5EF"))))
- `(org-agenda-calendar-sexp ((,class (:foreground "#777777" :background "#E4EBFE"))))
+ `(org-agenda-calendar-event ((,class (:weight bold :foreground "#3774CC" :background "#E4EBFE"))))
+ `(org-agenda-calendar-sexp ((,class (:foreground "#327ACD" :background "#F3F7FC"))))
`(org-agenda-clocking ((,class (:foreground "black" :background "#EEC900"))))
`(org-agenda-column-dateline ((,class ,column)))
`(org-agenda-current-time ((,class (:underline t :foreground "#1662AF"))))
- `(org-agenda-date ((,class (:height 1.6 :weight bold :foreground "#1662AF"))))
- `(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
- `(org-agenda-date-weekend ((,class (:height 1.6 :weight bold :foreground "#4E4E4E"))))
+ `(org-agenda-date ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#1662AF"))))
+ `(org-agenda-date-today ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(org-agenda-date-weekend ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#4E4E4E"))))
`(org-agenda-diary ((,class (:weight bold :foreground "green4" :background "light blue"))))
`(org-agenda-dimmed-todo-face ((,class (:foreground "gold2"))))
`(org-agenda-done ((,class (:foreground "#555555"))))
`(org-agenda-filter-category ((,class (:weight bold :foreground "orange"))))
+ `(org-agenda-filter-effort ((,class (:weight bold :foreground "orange"))))
+ `(org-agenda-filter-regexp ((,class (:weight bold :foreground "orange"))))
`(org-agenda-filter-tags ((,class (:weight bold :foreground "orange"))))
`(org-agenda-restriction-lock ((,class (:background "#E77D63"))))
- `(org-agenda-structure ((,class (:height 1.6 :weight bold :foreground "#1F8DD6"))))
+ `(org-agenda-structure ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#1F8DD6"))))
`(org-archived ((,class (:foreground "gray70"))))
`(org-beamer-tag ((,class (:box (:line-width 1 :color "#FABC18") :foreground "#2C2C2C" :background "#FFF8D0"))))
`(org-block ((,class ,code-block)))
- `(org-block-background ((,class (:background "#FFFFE0"))))
- `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
- `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
- `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "white" :background "#777777"))))
+ `(org-block-background ((,class (:background "#FFFFE0" :extend t)))) ;; :inherit fixed-pitch))))
+ `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5" :extend t))))
+ `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5" :extend t))))
+ `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "#123555" :background "#A3A3A3"))))
`(org-clock-overlay ((,class (:foreground "white" :background "SkyBlue4"))))
`(org-code ((,class ,code-inline)))
`(org-column ((,class ,column)))
@@ -527,14 +759,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(org-dim ((,class (:foreground "#AAAAAA"))))
`(org-document-info ((,class (:foreground "#484848"))))
`(org-document-info-keyword ((,class (:foreground "#008ED1" :background "#EAEAFF"))))
- `(org-document-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "black"))))
+ `(org-document-title ((,class (:height 1.8 :weight bold :foreground "black"))))
`(org-done ((,class (:weight bold :box (:line-width 1 :color "#BBBBBB") :foreground "#BBBBBB" :background "#F0F0F0"))))
- `(org-drawer ((,class (:foreground "light sky blue"))))
- `(org-ellipsis ((,class (:underline nil :box (:line-width 1 :color "#999999") :foreground "#999999" :background "#FFF8C0")))) ; #FFEE62
+ `(org-drawer ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA" :extend nil))))
+ `(org-ellipsis ((,class (:underline nil :foreground "#999999")))) ; #FFEE62
`(org-example ((,class (:foreground "blue" :background "#EAFFEA"))))
`(org-footnote ((,class (:underline t :foreground "#008ED1"))))
`(org-formula ((,class (:foreground "chocolate1"))))
- `(org-headline-done ((,class (:height 1.0 :weight normal :strike-through t :foreground "#ADADAD"))))
+ `(org-headline-done ((,class (:height 1.0 :weight normal :foreground "#ADADAD"))))
`(org-hide ((,class (:foreground "#E2E2E2"))))
`(org-inlinetask ((,class (:box (:line-width 1 :color "#EBEBEB") :foreground "#777777" :background "#FFFFD6"))))
`(org-latex-and-related ((,class (:foreground "#336699" :background "white"))))
@@ -548,25 +780,25 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(org-level-8 ((,class ,ol8)))
`(org-link ((,class ,link)))
`(org-list-dt ((,class (:weight bold :foreground "#335EA8"))))
- `(org-macro ((,class (:foreground "white" :background "#EDB802"))))
+ `(org-macro ((,class (:weight bold :foreground "#EDB802"))))
`(org-meta-line ((,class (:slant normal :foreground "#008ED1" :background "#EAEAFF"))))
- `(org-mode-line-clock ((,class ,clock-line)))
+ `(org-mode-line-clock ((,class (:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#FFA335"))))
`(org-mode-line-clock-overrun ((,class (:weight bold :box (:line-width 1 :color "#335EA8") :foreground "white" :background "#FF4040"))))
`(org-number-of-items ((,class (:weight bold :foreground "white" :background "#79BA79"))))
`(org-property-value ((,class (:foreground "#00A000"))))
`(org-quote ((,class (:slant italic :foreground "dim gray" :background "#FFFFE0"))))
`(org-scheduled ((,class (:foreground "#333333"))))
- `(org-scheduled-previously ((,class (:foreground "#F22659"))))
+ `(org-scheduled-previously ((,class (:foreground "#1466C6"))))
`(org-scheduled-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
`(org-sexp-date ((,class (:foreground "#3774CC"))))
`(org-special-keyword ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA"))))
- `(org-table ((,class (:foreground "dark green" :background "#EAFFEA"))))
+ `(org-table ((,class (:foreground "dark green" :background "#EAFFEA")))) ;; :inherit fixed-pitch))))
`(org-tag ((,class (:weight normal :slant italic :foreground "#9A9FA4" :background "white"))))
- `(org-target ((,class ,link)))
+ `(org-target ((,class (:foreground "#FF6DAF"))))
`(org-time-grid ((,class (:foreground "#CFCFCF"))))
`(org-todo ((,class (:weight bold :box (:line-width 1 :color "#D8ABA7") :foreground "#D8ABA7" :background "#FFE6E4"))))
`(org-upcoming-deadline ((,class (:foreground "#FF5555"))))
- `(org-verbatim ((,class (:foreground "#0066CC"))))
+ `(org-verbatim ((,class (:foreground "#0066CC" :background "#F7FDFF"))))
`(org-verse ((,class (:slant italic :foreground "dim gray" :background "#EEEEEE"))))
`(org-warning ((,class (:weight bold :foreground "black" :background "#CCE7FF"))))
`(outline-1 ((,class ,ol1)))
@@ -577,17 +809,17 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(outline-6 ((,class ,ol6)))
`(outline-7 ((,class ,ol7)))
`(outline-8 ((,class ,ol8)))
- `(pabbrev-debug-display-label-face ((,class (:background "chartreuse"))))
+ `(pabbrev-debug-display-label-face ((,class (:foreground "white" :background "#A62154"))))
`(pabbrev-suggestions-face ((,class (:weight bold :foreground "white" :background "red"))))
`(pabbrev-suggestions-label-face ((,class (:weight bold :foreground "white" :background "purple"))))
`(paren-face-match ((,class ,paren-matched)))
`(paren-face-mismatch ((,class ,paren-unmatched)))
`(paren-face-no-match ((,class ,paren-unmatched)))
`(persp-selected-face ((,class (:weight bold :foreground "#EEF5FE"))))
- `(powerline-active1 ((,class (:background "grey22" :inherit mode-line))))
- `(powerline-active2 ((,class (:background "#4070B6" :inherit mode-line))))
- `(powerline-inactive1 ((,class (:background "#686868" :inherit mode-line-inactive))))
- `(powerline-inactive2 ((,class (:background "#A9A9A9" :inherit mode-line-inactive))))
+ `(powerline-active1 ((,class (:foreground "#85CEEB" :background "#383838" :inherit mode-line))))
+ `(powerline-active2 ((,class (:foreground "#85CEEB" :background "#4070B6" :inherit mode-line))))
+ `(powerline-inactive1 ((,class (:foreground "#F0F0EF" :background "#686868" :inherit mode-line-inactive))))
+ `(powerline-inactive2 ((,class (:foreground "#F0F0EF" :background "#A9A9A9" :inherit mode-line-inactive))))
`(rainbow-delimiters-depth-1-face ((,class (:foreground "#707183"))))
`(rainbow-delimiters-depth-2-face ((,class (:foreground "#7388D6"))))
`(rainbow-delimiters-depth-3-face ((,class (:foreground "#909183"))))
@@ -599,29 +831,33 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(rainbow-delimiters-depth-9-face ((,class (:foreground "#887070"))))
`(rainbow-delimiters-mismatched-face ((,class ,paren-unmatched)))
`(rainbow-delimiters-unmatched-face ((,class ,paren-unmatched)))
- `(realgud-overlay-arrow1 ((,class (:foreground "#005522"))))
- `(realgud-overlay-arrow2 ((,class (:foreground "#c18401"))))
- `(realgud-overlay-arrow3 ((,class (:foreground "#909183"))))
- `(realgud-bp-disabled-face ((,class (:foreground "#909183"))))
- `(realgud-bp-line-enabled-face ((,class (:underline "red"))))
- `(realgud-bp-line-disabled-face ((,class (:underline "#909183"))))
- `(realgud-file-name ((,class :foreground "#005522")))
- `(realgud-line-number ((,class :foreground "#A535AE")))
- `(realgud-backtrace-number ((,class :foreground "#A535AE" :weight bold)))
`(recover-this-file ((,class (:weight bold :background "#FF3F3F"))))
`(rng-error ((,class (:weight bold :foreground "red" :background "#FBE3E4"))))
`(sh-heredoc ((,class (:foreground "blue" :background "#EEF5FE"))))
`(sh-quoted-exec ((,class (:foreground "#FF1493"))))
- `(shadow ((,class ,shadow)))
+ `(shadow ((,class ,shadow))) ; Used for grep context lines.
`(shell-option-face ((,class (:foreground "forest green"))))
`(shell-output-2-face ((,class (:foreground "blue"))))
`(shell-output-3-face ((,class (:foreground "purple"))))
`(shell-output-face ((,class (:foreground "black"))))
;; `(shell-prompt-face ((,class (:weight bold :foreground "yellow"))))
+ `(shm-current-face ((,class (:background "#EEE8D5"))))
+ `(shm-quarantine-face ((,class (:background "lemonchiffon"))))
`(show-paren-match ((,class ,paren-matched)))
`(show-paren-mismatch ((,class ,paren-unmatched)))
`(sml-modeline-end-face ((,class (:background "#6BADF6")))) ; #335EA8
`(sml-modeline-vis-face ((,class (:background "#1979CA"))))
+ `(term ((,class (:foreground "#333333" :background "#FFFFFF"))))
+
+ ;; `(sp-pair-overlay-face ((,class ())))
+ ;; `(sp-show-pair-enclosing ((,class ())))
+ ;; `(sp-show-pair-match-face ((,class ()))) ; ~ Pair highlighting (matching tags).
+ ;; `(sp-show-pair-mismatch-face ((,class ())))
+ ;; `(sp-wrap-overlay-closing-pair ((,class ())))
+ ;; `(sp-wrap-overlay-face ((,class ())))
+ ;; `(sp-wrap-overlay-opening-pair ((,class ())))
+ ;; `(sp-wrap-tag-overlay-face ((,class ())))
+
`(speedbar-button-face ((,class (:foreground "green4"))))
`(speedbar-directory-face ((,class (:foreground "blue4"))))
`(speedbar-file-face ((,class (:foreground "cyan4"))))
@@ -639,7 +875,6 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(tex-verbatim ((,class (:foreground "blue"))))
`(tool-bar ((,class (:box (:line-width 1 :style released-button) :foreground "black" :background "gray75"))))
`(tooltip ((,class (:foreground "black" :background "light yellow"))))
- `(trailing-whitespace ((,class (:background "#F6EBFE"))))
`(traverse-match-face ((,class (:weight bold :foreground "blue violet"))))
`(vc-annotate-face-3F3FFF ((,class (:foreground "#3F3FFF" :background "black"))))
`(vc-annotate-face-3F6CFF ((,class (:foreground "#3F3FFF" :background "black"))))
@@ -654,11 +889,24 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(vc-annotate-face-83FF3F ((,class (:foreground "#B0FF3F" :background "black"))))
`(vc-annotate-face-B0FF3F ((,class (:foreground "#B0FF3F" :background "black"))))
`(vc-annotate-face-DDFF3F ((,class (:foreground "#FFF33F" :background "black"))))
+ `(vc-annotate-face-F6FFCC ((,class (:foreground "black" :background "#FFFFC0"))))
`(vc-annotate-face-FF3F3F ((,class (:foreground "#FF3F3F" :background "black"))))
`(vc-annotate-face-FF6C3F ((,class (:foreground "#FF3F3F" :background "black"))))
`(vc-annotate-face-FF993F ((,class (:foreground "#FF993F" :background "black"))))
`(vc-annotate-face-FFC63F ((,class (:foreground "#FF993F" :background "black"))))
`(vc-annotate-face-FFF33F ((,class (:foreground "#FFF33F" :background "black"))))
+
+ ;; ;; vc
+ ;; (vc-up-to-date-state ((,c :foreground ,(gc 'green-1))))
+ ;; (vc-edited-state ((,c :foreground ,(gc 'yellow+1))))
+ ;; (vc-missing-state ((,c :foreground ,(gc 'red))))
+ ;; (vc-conflict-state ((,c :foreground ,(gc 'red+2) :weight bold)))
+ ;; (vc-locked-state ((,c :foreground ,(gc 'cyan-1))))
+ ;; (vc-locally-added-state ((,c :foreground ,(gc 'blue))))
+ ;; (vc-needs-update-state ((,c :foreground ,(gc 'magenta))))
+ ;; (vc-removed-state ((,c :foreground ,(gc 'red-1))))
+
+ `(vhl/default-face ((,class ,volatile-highlight))) ; `volatile-highlights.el' (for undo, yank).
`(w3m-anchor ((,class ,link)))
`(w3m-arrived-anchor ((,class (:foreground "purple1"))))
`(w3m-bitmap-image-face ((,class (:foreground "gray4" :background "green"))))
@@ -675,38 +923,139 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(w3m-link-numbering ((,class (:foreground "#B4C7EB")))) ; mouseless browsing
`(w3m-strike-through-face ((,class (:strike-through t))))
`(w3m-underline-face ((,class (:underline t))))
- `(which-func ((,class (:weight bold :foreground "white"))))
+
+ ;; `(web-mode-block-attr-name-face ((,class ())))
+ ;; `(web-mode-block-attr-value-face ((,class ())))
+ ;; `(web-mode-block-comment-face ((,class ())))
+ ;; `(web-mode-block-control-face ((,class ())))
+ ;; `(web-mode-block-delimiter-face ((,class ())))
+ ;; `(web-mode-block-face ((,class ())))
+ ;; `(web-mode-block-string-face ((,class ())))
+ ;; `(web-mode-bold-face ((,class ())))
+ ;; `(web-mode-builtin-face ((,class ())))
+ ;; `(web-mode-comment-face ((,class ())))
+ ;; `(web-mode-comment-keyword-face ((,class ())))
+ ;; `(web-mode-constant-face ((,class ())))
+ ;; `(web-mode-css-at-rule-face ((,class ())))
+ ;; `(web-mode-css-color-face ((,class ())))
+ ;; `(web-mode-css-comment-face ((,class ())))
+ ;; `(web-mode-css-function-face ((,class ())))
+ ;; `(web-mode-css-priority-face ((,class ())))
+ ;; `(web-mode-css-property-name-face ((,class ())))
+ ;; `(web-mode-css-pseudo-class-face ((,class ())))
+ ;; `(web-mode-css-selector-face ((,class ())))
+ ;; `(web-mode-css-string-face ((,class ())))
+ ;; `(web-mode-css-variable-face ((,class ())))
+ ;; `(web-mode-current-column-highlight-face ((,class ())))
+ `(web-mode-current-element-highlight-face ((,class (:background "#99CCFF")))) ; #FFEE80
+ ;; `(web-mode-doctype-face ((,class ())))
+ ;; `(web-mode-error-face ((,class ())))
+ ;; `(web-mode-filter-face ((,class ())))
+ `(web-mode-folded-face ((,class (:box (:line-width 1 :color "#777777") :foreground "#9A9A6A" :background "#F3F349"))))
+ ;; `(web-mode-function-call-face ((,class ())))
+ ;; `(web-mode-function-name-face ((,class ())))
+ ;; `(web-mode-html-attr-custom-face ((,class ())))
+ ;; `(web-mode-html-attr-engine-face ((,class ())))
+ ;; `(web-mode-html-attr-equal-face ((,class ())))
+ `(web-mode-html-attr-name-face ((,class ,xml-attribute)))
+ ;; `(web-mode-html-attr-value-face ((,class ())))
+ ;; `(web-mode-html-entity-face ((,class ())))
+ `(web-mode-html-tag-bracket-face ((,class ,xml-tag)))
+ ;; `(web-mode-html-tag-custom-face ((,class ())))
+ `(web-mode-html-tag-face ((,class ,xml-tag)))
+ ;; `(web-mode-html-tag-namespaced-face ((,class ())))
+ ;; `(web-mode-inlay-face ((,class ())))
+ ;; `(web-mode-italic-face ((,class ())))
+ ;; `(web-mode-javascript-comment-face ((,class ())))
+ ;; `(web-mode-javascript-string-face ((,class ())))
+ ;; `(web-mode-json-comment-face ((,class ())))
+ ;; `(web-mode-json-context-face ((,class ())))
+ ;; `(web-mode-json-key-face ((,class ())))
+ ;; `(web-mode-json-string-face ((,class ())))
+ ;; `(web-mode-jsx-depth-1-face ((,class ())))
+ ;; `(web-mode-jsx-depth-2-face ((,class ())))
+ ;; `(web-mode-jsx-depth-3-face ((,class ())))
+ ;; `(web-mode-jsx-depth-4-face ((,class ())))
+ ;; `(web-mode-keyword-face ((,class ())))
+ ;; `(web-mode-param-name-face ((,class ())))
+ ;; `(web-mode-part-comment-face ((,class ())))
+ `(web-mode-part-face ((,class (:background "#FFFFE0"))))
+ ;; `(web-mode-part-string-face ((,class ())))
+ ;; `(web-mode-preprocessor-face ((,class ())))
+ `(web-mode-script-face ((,class (:background "#EFF0F1"))))
+ ;; `(web-mode-sql-keyword-face ((,class ())))
+ ;; `(web-mode-string-face ((,class ())))
+ ;; `(web-mode-style-face ((,class ())))
+ ;; `(web-mode-symbol-face ((,class ())))
+ ;; `(web-mode-type-face ((,class ())))
+ ;; `(web-mode-underline-face ((,class ())))
+ ;; `(web-mode-variable-name-face ((,class ())))
+ ;; `(web-mode-warning-face ((,class ())))
+ ;; `(web-mode-whitespace-face ((,class ())))
+
+ `(which-func ((,class (:weight bold :slant italic :foreground "white"))))
+ ;; `(which-key-command-description-face)
+ ;; `(which-key-group-description-face)
+ ;; `(which-key-highlighted-command-face)
+ ;; `(which-key-key-face)
+ `(which-key-local-map-description-face ((,class (:weight bold :background "#F3F7FC" :inherit which-key-command-description-face))))
+ ;; `(which-key-note-face)
+ ;; `(which-key-separator-face)
+ ;; `(which-key-special-key-face)
`(widget-button ((,class ,link)))
`(widget-button-pressed ((,class (:foreground "red"))))
`(widget-documentation ((,class (:foreground "green4"))))
`(widget-field ((,class (:background "gray85"))))
`(widget-inactive ((,class (:foreground "dim gray"))))
`(widget-single-line-field ((,class (:background "gray85"))))
- `(yas/field-debug-face ((,class (:background "ivory2"))))
- `(yas/field-highlight-face ((,class (:background "DarkSeaGreen1"))))
+ `(woman-bold ((,class (:weight bold :foreground "#F13D3D"))))
+ `(woman-italic ((,class (:weight bold :slant italic :foreground "#46BE1B"))))
+ `(woman-symbol ((,class (:weight bold :foreground "purple"))))
+ `(yas-field-debug-face ((,class (:foreground "white" :background "#A62154"))))
+ `(yas-field-highlight-face ((,class (:box (:line-width 1 :color "#838383") :foreground "black" :background "#D4DCD8"))))
+
+ ;; `(ztreep-arrow-face ((,class ())))
+ ;; `(ztreep-diff-header-face ((,class ())))
+ ;; `(ztreep-diff-header-small-face ((,class ())))
+ `(ztreep-diff-model-add-face ((,class (:weight bold :foreground "#008800"))))
+ `(ztreep-diff-model-diff-face ((,class (:weight bold :foreground "#0044DD"))))
+ `(ztreep-diff-model-ignored-face ((,class (:strike-through t :foreground "#9E9E9E"))))
+ `(ztreep-diff-model-normal-face ((,class (:foreground "#000000"))))
+ ;; `(ztreep-expand-sign-face ((,class ())))
+ ;; `(ztreep-header-face ((,class ())))
+ ;; `(ztreep-leaf-face ((,class ())))
+ ;; `(ztreep-node-face ((,class ())))
+
))
(custom-theme-set-variables 'leuven
- '(ansi-color-faces-vector
- [default default default italic underline success warning error])
- '(ansi-color-names-vector
- ["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"])
- ; colors used in Shell mode
+
+ ;; highlight-sexp-mode.
+ '(hl-sexp-background-color "#efebe9")
+
+ '(ansi-color-faces-vector
+ [default default default italic underline success warning error])
+
+ ;; Colors used in Shell mode.
+ '(ansi-color-names-vector
+ ["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"])
)
;;;###autoload
(when (and (boundp 'custom-theme-load-path)
load-file-name)
- ;; add theme folder to `custom-theme-load-path' when installing over MELPA
+ ;; Add theme folder to `custom-theme-load-path' when installing over MELPA.
(add-to-list 'custom-theme-load-path
(file-name-as-directory (file-name-directory load-file-name))))
(provide-theme 'leuven)
+;; This is for the sake of Emacs.
;; Local Variables:
+;; no-byte-compile: t
+;; time-stamp-end: "$"
;; time-stamp-format: "%:y%02m%02d.%02H%02M"
;; time-stamp-start: "Version: "
-;; time-stamp-end: "$"
;; End:
;;; leuven-theme.el ends here
--
2.21.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-04-22 5:31 bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk Fab Rice
@ 2020-04-22 6:10 ` Stefan Kangas
2020-04-22 19:58 ` Fab Rice
2020-04-24 10:57 ` Serghei via Bug reports for GNU Emacs, the Swiss army knife of text editors
2 siblings, 0 replies; 15+ messages in thread
From: Stefan Kangas @ 2020-04-22 6:10 UTC (permalink / raw)
To: Fab Rice; +Cc: 40759, dgutov
Just one nitpick:
> -;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
> +;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
I think https is preferred here.
Best regards,
Stefan Kangas
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-04-22 5:31 bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk Fab Rice
2020-04-22 6:10 ` Stefan Kangas
@ 2020-04-22 19:58 ` Fab Rice
2020-04-23 18:47 ` Stefan Kangas
2020-04-24 10:57 ` Serghei via Bug reports for GNU Emacs, the Swiss army knife of text editors
2 siblings, 1 reply; 15+ messages in thread
From: Fab Rice @ 2020-04-22 19:58 UTC (permalink / raw)
To: Stefan Kangas; +Cc: 40759, dgutov
[-- Attachment #1: Type: text/plain, Size: 162 bytes --]
Dear Stefan,
Please find here an update patch file, then. Thanks for your comments!
BTW, could this go to the "emacs-27" branch, please?
Best regards,
Fabrice
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Update-leuven-theme.el.patch --]
[-- Type: text/x-diff; name=0001-Update-leuven-theme.el.patch, Size: 70741 bytes --]
From 961e8507f1eda45f59eab90de9f360db044e9e66 Mon Sep 17 00:00:00 2001
From: Fabrice Niessen <fniessen@pirilampo.org>
Date: Wed, 22 Apr 2020 21:53:46 +0200
Subject: [PATCH] Update Leuven-theme.el
---
etc/themes/leuven-theme.el | 703 +++++++++++++++++++++++++++----------
1 file changed, 526 insertions(+), 177 deletions(-)
diff --git etc/themes/leuven-theme.el etc/themes/leuven-theme.el
index 0d25ab9c5b..0e0044ef19 100644
--- etc/themes/leuven-theme.el
+++ etc/themes/leuven-theme.el
@@ -4,7 +4,7 @@
;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
;; URL: https://github.com/fniessen/emacs-leuven-theme
-;; Version: 20170912.2328
+;; Version: 20200422.2152
;; Keywords: color theme
;; This file is part of GNU Emacs.
@@ -31,58 +31,120 @@
;;
;; (load-theme 'leuven t)
;;
-;; Requirements: Emacs 24.
+;; Requirements: Emacs 24+.
+;;
+;; NOTE -- Would you like implement a version of this for dark backgrounds,
+;; please do so! I'm willing to integrate it...
;;; Code:
+;;; Options.
+
+(defgroup leuven nil
+ "Leuven theme options.
+The theme has to be reloaded after changing anything in this group."
+ :group 'faces)
+
+(defcustom leuven-scale-outline-headlines t
+ "Scale `outline' (and `org') level-1 headlines.
+This can be nil for unscaled, t for using the theme default, or a scaling number."
+ :type '(choice
+ (const :tag "Unscaled" nil)
+ (const :tag "Default provided by theme" t)
+ (number :tag "Set scaling"))
+ :group 'leuven)
+
+(defcustom leuven-scale-org-agenda-structure t
+ "Scale Org agenda structure lines, like dates.
+This can be nil for unscaled, t for using the theme default, or a scaling number."
+ :type '(choice
+ (const :tag "Unscaled" nil)
+ (const :tag "Default provided by theme" t)
+ (number :tag "Set scaling"))
+ :group 'leuven)
+
+(defun leuven-scale-font (control default-height)
+ "Function for splicing optional font heights into face descriptions.
+CONTROL can be a number, nil, or t. When t, use DEFAULT-HEIGHT."
+ (cond
+ ((numberp control) (list :height control))
+ ((eq t control) (list :height default-height))
+ (t nil)))
+
+;;; Theme Faces.
+
(deftheme leuven
"Face colors with a light background.
-Basic, Font Lock, Isearch, Gnus, Message, Diff, Ediff, Flyspell,
-Semantic, and Ansi-Color faces are included -- and much more...")
+Basic, Font Lock, Isearch, Gnus, Message, Org mode, Diff, Ediff,
+Flyspell, Semantic, and Ansi-Color faces are included -- and much
+more...")
(let ((class '((class color) (min-colors 89)))
- ;; Leuven generic colors
- (cancel '(:slant italic :strike-through t :foreground "gray55"))
+ ;; Leuven generic colors.
+ (cancel '(:slant italic :strike-through t :foreground "#A9A9A9"))
(clock-line '(:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#EEC900"))
- (code-block '(:foreground "#000088" :background "#FFFFE0"))
- (code-inline '(:foreground "#006400" :background "#FDFFF7"))
+ (code-block '(:foreground "#000088" :background "#FFFFE0" :extend t))
+ (code-inline '(:foreground "#006400" :background "#FDFFF7" :extend t))
(column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#E6AD4F" :background "#FFF2DE"))
- (diff-added '(:foreground "#008000" :background "#DDFFDD"))
+ (completion-inline '(:weight normal :foreground "#C0C0C0" :inherit hl-line)) ; Like Google.
+ (completion-other-candidates '(:weight bold :foreground "black" :background "#EBF4FE"))
+ (completion-selected-candidate '(:weight bold :foreground "white" :background "#0052A4"))
+ (diff-added '(:background "#DDFFDD"))
(diff-changed '(:foreground "#0000FF" :background "#DDDDFF"))
- (diff-header '(:foreground "#800000" :background "#FFFFAF"))
+ (diff-header '(:weight bold :foreground "#800000" :background "#FFFFAF"))
(diff-hunk-header '(:foreground "#990099" :background "#FFEEFF"))
- (diff-none '(:foreground "gray33"))
- (diff-removed '(:foreground "#A60000" :background "#FFDDDD"))
+ (diff-none '(:foreground "#888888"))
+ (diff-refine-added '(:background "#97F295"))
+ (diff-refine-removed '(:background "#FFB6BA"))
+ (diff-removed '(:background "#FEE8E9"))
(directory '(:weight bold :foreground "blue" :background "#FFFFD2"))
- (highlight-line '(:background "#FFFFD7")) ; #F5F5F5
- (highlight-line-gnus '(:background "#DAEAFC")) ; defined in `gnus-leuven.el'
+ (file '(:foreground "black"))
+ (function-param '(:foreground "#247284"))
+ (grep-file-name '(:weight bold :foreground "#2A489E")) ; Used for grep hits.
+ (grep-line-number '(:weight bold :foreground "#A535AE"))
+ (highlight-blue '(:background "#E6ECFF" :extend t))
+ (highlight-blue2 '(:background "#E4F1F9" :extend t))
+ (highlight-gray '(:background "#E4E4E3" :extend t))
+ (highlight-green '(:background "#D5F1CF" :extend t))
+ (highlight-red '(:background "#FFC8C8" :extend t))
+ (highlight-yellow '(:background "#F6FECD" :extend t))
(link '(:weight normal :underline t :foreground "#006DAF"))
+ (link-no-underline '(:weight normal :foreground "#006DAF"))
(mail-header-name '(:family "Sans Serif" :weight normal :foreground "#A3A3A2"))
(mail-header-other '(:family "Sans Serif" :slant normal :foreground "#666666"))
- (mail-read '(:weight normal :foreground "#86878B"))
- (mail-ticked '(:weight bold :background "#FBE6EF"))
+ (mail-read '(:foreground "#8C8C8C"))
+ (mail-read-high '(:foreground "#808080"))
+ (mail-ticked '(:foreground "#FF3300"))
(mail-to '(:family "Sans Serif" :underline nil :foreground "#006DAF"))
- (mail-unread '(:weight bold :foreground "black"))
- (marked-line '(:weight bold :foreground "white" :background "red"))
- (match '(:weight bold :background "#FBE448")) ; occur patterns
- (ol1 '(:height 1.3 :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0"))
- (ol2 '(:height 1.0 :weight bold :overline "#123555" :foreground "#123555" :background "#E5F4FB"))
- (ol3 '(:height 1.0 :weight bold :foreground "#005522" :background "#EFFFEF"))
- (ol4 '(:height 1.0 :weight bold :slant normal :foreground "#EA6300"))
- (ol5 '(:height 1.0 :weight bold :slant normal :foreground "#E3258D"))
- (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC"))
- (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C"))
- (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"))
+ (mail-unread '(:weight bold :foreground "#000000"))
+ (mail-unread-high '(:weight bold :foreground "#135985"))
+ (marked-line '(:foreground "#AA0000" :background "#FFAAAA"))
+ (match '(:weight bold :background "#FFFF00")) ; occur patterns + match in helm for files + match in Org files.
+ (ol1 `(,@(leuven-scale-font leuven-scale-outline-headlines 1.3) :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0" :extend t))
+ (ol2 '(:height 1.0 :weight bold :overline "#123555" :foreground "#123555" :background "#E5F4FB" :extend t))
+ (ol3 '(:height 1.0 :weight bold :foreground "#005522" :background "#EFFFEF" :extend t))
+ (ol4 '(:height 1.0 :weight bold :slant normal :foreground "#EA6300" :extend t))
+ (ol5 '(:height 1.0 :weight bold :slant normal :foreground "#E3258D" :extend t))
+ (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC" :extend t))
+ (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C" :extend t))
+ (ol8 '(:height 1.0 :weight bold :slant italic :foreground "#FD8008" :extend t))
+ (paren-matched '(:background "#C0E8C3")) ; Or take that green for region?
+ (paren-unmatched '(:weight bold :underline "red" :foreground "black" :background "#FFA5A5"))
+ (region '(:background "#8ED3FF" :extend t))
(shadow '(:foreground "#7F7F7F"))
(string '(:foreground "#008000")) ; or #D0372D
(subject '(:family "Sans Serif" :weight bold :foreground "black"))
- (symlink '(:foreground "deep sky blue"))
- (volatile-highlight '(:underline nil :background "#FFF876"))
- (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA")))
+ (symlink '(:foreground "#1F8DD6"))
+ (tab '(:foreground "#E8E8E8" :background "white"))
+ (trailing '(:foreground "#E8E8E8" :background "#FFFFAB"))
+ (volatile-highlight '(:underline nil :foreground "white" :background "#9E3699"))
+ (volatile-highlight-supersize '(:height 1.1 :underline nil :foreground "white" :background "#9E3699")) ; flash-region
+ (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA"))
+ (xml-attribute '(:foreground "#F36335"))
+ (xml-tag '(:foreground "#AE1B9A"))
+ (highlight-current-tag '(:background "#E8E8FF")) ; #EEF3F6 or #FFEB26
+ )
(custom-theme-set-faces
'leuven
@@ -91,45 +153,49 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(bold-italic ((,class (:weight bold :slant italic :foreground "black"))))
`(italic ((,class (:slant italic :foreground "#1A1A1A"))))
`(underline ((,class (:underline t))))
- `(cursor ((,class (:background "#0FB300"))))
+ `(cursor ((,class (:background "#21BDFF"))))
- ;; Highlighting faces
- `(fringe ((,class (:foreground "#9B9B9B" :background "#EDEDED"))))
- `(highlight ((,class ,volatile-highlight)))
+ ;; Lucid toolkit emacs menus.
+ `(menu ((,class (:foreground "#FFFFFF" :background "#333333"))))
+
+ ;; Highlighting faces.
+ `(fringe ((,class (:foreground "#4C9ED9" :background "white"))))
+ `(highlight ((,class ,highlight-blue)))
`(region ((,class ,region)))
- `(secondary-selection ((,class ,match))) ; used by Org-mode for highlighting matched entries and keywords
- `(isearch ((,class (:weight bold :underline "#FF9632" :foreground nil :background "#FDBD33"))))
- `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FF9999"))))
- `(lazy-highlight ((,class (:underline "#FF9632" :background "#FFFF00")))) ; isearch others
- `(trailing-whitespace ((,class (:background "#FFFF57"))))
- `(whitespace-hspace ((,class (:foreground "#D2D2D2"))))
- `(whitespace-indentation ((,class (:foreground "#A1A1A1" :background "white"))))
+ `(secondary-selection ((,class ,match))) ; Used by Org-mode for highlighting matched entries and keywords.
+ `(isearch ((,class (:underline "black" :foreground "white" :background "#5974AB"))))
+ `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FFCCCC"))))
+ `(lazy-highlight ((,class (:foreground "black" :background "#FFFF00")))) ; Isearch others (see `match').
+ `(trailing-whitespace ((,class ,trailing)))
+ `(query-replace ((,class (:inherit isearch))))
+ `(whitespace-hspace ((,class (:foreground "#D2D2D2")))) ; see also `nobreak-space'
+ `(whitespace-indentation ((,class ,tab)))
`(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88"))))
- `(whitespace-tab ((,class (:foreground "#A1A1A1" :background "white"))))
- `(whitespace-trailing ((,class (:foreground "#B3B3B3" :background "#FFFF57"))))
+ `(whitespace-tab ((,class ,tab)))
+ `(whitespace-trailing ((,class ,trailing)))
- ;; Mode line faces
+ ;; Mode line faces.
`(mode-line ((,class (:box (:line-width 1 :color "#1A2F54") :foreground "#85CEEB" :background "#335EA8"))))
`(mode-line-inactive ((,class (:box (:line-width 1 :color "#4E4E4C") :foreground "#F0F0EF" :background "#9B9C97"))))
`(mode-line-buffer-id ((,class (:weight bold :foreground "white"))))
`(mode-line-emphasis ((,class (:weight bold :foreground "white"))))
`(mode-line-highlight ((,class (:foreground "yellow"))))
- ;; Escape and prompt faces
+ ;; Escape and prompt faces.
`(minibuffer-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(minibuffer-noticeable-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(escape-glyph ((,class (:foreground "#008ED1"))))
- `(homoglyph ((,class (:foreground "#008ED1"))))
`(error ((,class (:foreground "red"))))
`(warning ((,class (:weight bold :foreground "orange"))))
`(success ((,class (:foreground "green"))))
- ;; Font lock faces
+ ;; Font lock faces.
`(font-lock-builtin-face ((,class (:foreground "#006FE0"))))
`(font-lock-comment-delimiter-face ((,class (:foreground "#8D8D84")))) ; #696969
`(font-lock-comment-face ((,class (:slant italic :foreground "#8D8D84")))) ; #696969
`(font-lock-constant-face ((,class (:foreground "#D0372D"))))
`(font-lock-doc-face ((,class (:foreground "#036A07"))))
+ ;; `(font-lock-doc-string-face ((,class (:foreground "#008000")))) ; XEmacs only, but is used for HTML exports from org2html (and not interactively)
`(font-lock-function-name-face ((,class (:weight normal :foreground "#006699"))))
`(font-lock-keyword-face ((,class (:bold nil :foreground "#0000FF")))) ; #3654DC
`(font-lock-preprocessor-face ((,class (:foreground "#808080"))))
@@ -140,32 +206,32 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(font-lock-variable-name-face ((,class (:weight normal :foreground "#BA36A5")))) ; #800080
`(font-lock-warning-face ((,class (:weight bold :foreground "red"))))
- ;; Button and link faces
+ ;; Button and link faces.
`(link ((,class ,link)))
`(link-visited ((,class (:underline t :foreground "#E5786D"))))
`(button ((,class (:underline t :foreground "#006DAF"))))
- `(header-line ((,class (:weight bold :underline "black" :overline "black" :foreground "black" :background "#FFFF88"))))
+ `(header-line ((,class (:box (:line-width 1 :color "black") :foreground "black" :background "#F0F0F0"))))
- ;; Gnus faces
+ ;; Gnus faces.
`(gnus-button ((,class (:weight normal))))
`(gnus-cite-attribution-face ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-1 ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-10 ((,class (:foreground "#990000"))))
- `(gnus-cite-face-2 ((,class (:foreground "#660066"))))
- `(gnus-cite-face-3 ((,class (:foreground "#007777"))))
- `(gnus-cite-face-4 ((,class (:foreground "#990000"))))
- `(gnus-cite-face-5 ((,class (:foreground "#000099"))))
- `(gnus-cite-face-6 ((,class (:foreground "#BB6600"))))
- `(gnus-cite-face-7 ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-8 ((,class (:foreground "#660066"))))
- `(gnus-cite-face-9 ((,class (:foreground "#007777"))))
+ `(gnus-cite-1 ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
+ `(gnus-cite-2 ((,class (:foreground "#660066" :background "#F6F6F6"))))
+ `(gnus-cite-3 ((,class (:foreground "#007777" :background "#F6F6F6"))))
+ `(gnus-cite-4 ((,class (:foreground "#990000" :background "#F6F6F6"))))
+ `(gnus-cite-5 ((,class (:foreground "#000099" :background "#F6F6F6"))))
+ `(gnus-cite-6 ((,class (:foreground "#BB6600" :background "#F6F6F6"))))
+ `(gnus-cite-7 ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
+ `(gnus-cite-8 ((,class (:foreground "#660066" :background "#F6F6F6"))))
+ `(gnus-cite-9 ((,class (:foreground "#007777" :background "#F6F6F6"))))
+ `(gnus-cite-10 ((,class (:foreground "#990000" :background "#F6F6F6"))))
`(gnus-emphasis-bold ((,class (:weight bold))))
`(gnus-emphasis-highlight-words ((,class (:foreground "yellow" :background "black"))))
`(gnus-group-mail-1 ((,class (:weight bold :foreground "#FF50B0"))))
`(gnus-group-mail-1-empty ((,class (:foreground "#5050B0"))))
`(gnus-group-mail-2 ((,class (:weight bold :foreground "#FF0066"))))
`(gnus-group-mail-2-empty ((,class (:foreground "#660066"))))
- `(gnus-group-mail-3 ((,class (:weight bold :foreground "black"))))
+ `(gnus-group-mail-3 ((,class ,mail-unread)))
`(gnus-group-mail-3-empty ((,class ,mail-read)))
`(gnus-group-mail-low ((,class ,cancel)))
`(gnus-group-mail-low-empty ((,class ,cancel)))
@@ -173,8 +239,8 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-group-news-1-empty ((,class (:foreground "#5050B0"))))
`(gnus-group-news-2 ((,class (:weight bold :foreground "#FF0066"))))
`(gnus-group-news-2-empty ((,class (:foreground "#660066"))))
- `(gnus-group-news-3 ((,class (:weight bold :foreground "black"))))
- `(gnus-group-news-3-empty ((,class (:foreground "#808080"))))
+ `(gnus-group-news-3 ((,class ,mail-unread)))
+ `(gnus-group-news-3-empty ((,class ,mail-read)))
`(gnus-group-news-4 ((,class (:weight bold :foreground "#FF0000"))))
`(gnus-group-news-4-empty ((,class (:foreground "#990000"))))
`(gnus-group-news-5 ((,class (:weight bold :foreground "#FF0099"))))
@@ -194,11 +260,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-signature ((,class (:slant italic :foreground "#8B8D8E"))))
`(gnus-splash ((,class (:foreground "#FF8C00"))))
`(gnus-summary-cancelled ((,class ,cancel)))
- `(gnus-summary-high-ancient ((,class (:weight normal :foreground "#808080" :background "#FFFFE6"))))
- `(gnus-summary-high-read ((,class (:weight normal :foreground "#999999" :background "#FFFFE6"))))
+ `(gnus-summary-high-ancient ((,class ,mail-unread-high)))
+ `(gnus-summary-high-read ((,class ,mail-read-high)))
`(gnus-summary-high-ticked ((,class ,mail-ticked)))
- `(gnus-summary-high-unread ((,class (:weight bold :foreground "black" :background "#FFFFCC"))))
- `(gnus-summary-low-ancient ((,class (:slant italic :foreground "gray55"))))
+ `(gnus-summary-high-unread ((,class ,mail-unread-high)))
+ `(gnus-summary-low-ancient ((,class (:slant italic :foreground "black"))))
`(gnus-summary-low-read ((,class (:slant italic :foreground "#999999" :background "#E0E0E0"))))
`(gnus-summary-low-ticked ((,class ,mail-ticked)))
`(gnus-summary-low-unread ((,class (:slant italic :foreground "black"))))
@@ -209,82 +275,105 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-summary-selected ((,class (:foreground "white" :background "#008CD7"))))
`(gnus-x-face ((,class (:foreground "black" :background "white"))))
- ;; Message faces
+ ;; Message faces.
`(message-header-name ((,class ,mail-header-name)))
`(message-header-cc ((,class ,mail-to)))
`(message-header-other ((,class ,mail-header-other)))
`(message-header-subject ((,class ,subject)))
`(message-header-to ((,class ,mail-to)))
- `(message-cited-text ((,class (:foreground "#5050B0"))))
+ `(message-cited-text ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
`(message-separator ((,class (:family "Sans Serif" :weight normal :foreground "#BDC2C6"))))
`(message-header-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC"))))
`(message-header-xheader ((,class ,mail-header-other)))
`(message-mml ((,class (:foreground "forest green"))))
- ;; Diff
+ ;; Diff.
`(diff-added ((,class ,diff-added)))
`(diff-changed ((,class ,diff-changed)))
`(diff-context ((,class ,diff-none)))
`(diff-file-header ((,class ,diff-header)))
`(diff-file1-hunk-header ((,class (:foreground "dark magenta" :background "#EAF2F5"))))
`(diff-file2-hunk-header ((,class (:foreground "#2B7E2A" :background "#EAF2F5"))))
- `(diff-function ((,class (:foreground "darkgray"))))
+ `(diff-function ((,class (:foreground "#CC99CC"))))
`(diff-header ((,class ,diff-header)))
`(diff-hunk-header ((,class ,diff-hunk-header)))
`(diff-index ((,class ,diff-header)))
- `(diff-indicator-added ((,class (:background "#AAFFAA"))))
- `(diff-indicator-changed ((,class (:background "#8080FF"))))
- `(diff-indicator-removed ((,class (:background "#FFBBBB"))))
+ `(diff-indicator-added ((,class (:foreground "#3A993A" :background "#CDFFD8"))))
+ `(diff-indicator-changed ((,class (:background "#DBEDFF"))))
+ `(diff-indicator-removed ((,class (:foreground "#CC3333" :background "#FFDCE0"))))
+ `(diff-refine-added ((,class ,diff-refine-added)))
`(diff-refine-change ((,class (:background "#DDDDFF"))))
+ `(diff-refine-removed ((,class ,diff-refine-removed)))
`(diff-removed ((,class ,diff-removed)))
- ;; SMerge
+ ;; SMerge.
+ `(smerge-mine ((,class ,diff-changed)))
+ `(smerge-other ((,class ,diff-added)))
+ `(smerge-base ((,class ,diff-removed)))
+ `(smerge-markers ((,class (:background "#FFE5CC"))))
`(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-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.
+ `(ediff-current-diff-A ((,class (:background "#FFDDDD" :extend t))))
+ `(ediff-current-diff-B ((,class (:background "#DDFFDD" :extend t))))
+ `(ediff-current-diff-C ((,class (:background "cyan" :extend t))))
+ `(ediff-even-diff-A ((,class (:background "light grey" :extend t))))
+ `(ediff-even-diff-B ((,class (:background "light grey" :extend t))))
+ `(ediff-fine-diff-A ((,class (:background "#FFAAAA" :extend t))))
+ `(ediff-fine-diff-B ((,class (:background "#55FF55" :extend t))))
+ `(ediff-odd-diff-A ((,class (:background "light grey" :extend t))))
+ `(ediff-odd-diff-B ((,class (:background "light grey" :extend t))))
- ;; Flyspell
-;; (when (version< emacs-version "24.XXX")
- `(flyspell-duplicate ((,class (:underline "#008000" :inherit nil))))
- `(flyspell-incorrect ((,class (:underline "red" :inherit nil))))
-;; `(flyspell-duplicate ((,class (:underline (:style wave :color "#008000") :inherit nil))))
-;; `(flyspell-incorrect ((,class (:underline (:style wave :color "red") :inherit nil))))
+ ;; Flyspell.
+ (if (version< emacs-version "24.4")
+ `(flyspell-duplicate ((,class (:underline "#F4EB80" :inherit nil))))
+ `(flyspell-duplicate ((,class (:underline (:style wave :color "#F4EB80") :background "#FAF7CC" :inherit nil)))))
+ (if (version< emacs-version "24.4")
+ `(flyspell-incorrect ((,class (:underline "#FAA7A5" :inherit nil))))
+ `(flyspell-incorrect ((,class (:underline (:style wave :color "#FAA7A5") :background "#F4D7DA":inherit nil)))))
- ;; ;; Semantic faces
+ ;; ;; Semantic faces.
;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4))))
;; `(semantic-decoration-on-private-members-face ((,class (:background ,alum-2))))
;; `(semantic-decoration-on-protected-members-face ((,class (:background ,alum-2))))
- ;; `(semantic-decoration-on-unknown-includes ((,class (:background ,choc-3))))
+ `(semantic-decoration-on-unknown-includes ((,class (:background "#FFF8F8"))))
;; `(semantic-decoration-on-unparsed-includes ((,class (:underline ,orange-3))))
- ;; `(semantic-tag-boundary-face ((,class (:overline ,blue-1))))
+ `(semantic-highlight-func-current-tag-face ((,class ,highlight-current-tag)))
+ `(semantic-tag-boundary-face ((,class (:overline "#777777")))) ; Method separator.
;; `(semantic-unmatched-syntax-face ((,class (:underline ,red-1))))
`(Info-title-1-face ((,class ,ol1)))
`(Info-title-2-face ((,class ,ol2)))
`(Info-title-3-face ((,class ,ol3)))
`(Info-title-4-face ((,class ,ol4)))
- `(ac-completion-face ((,class (:underline nil :foreground "#C0C0C0")))) ; like Google
- `(ace-jump-face-foreground ((,class (:foreground "black" :background "#FBE448"))))
+ `(ace-jump-face-foreground ((,class (:weight bold :foreground "black" :background "#FEA500"))))
+ `(ahs-face ((,class (:background "#E4E4FF"))))
+ `(ahs-definition-face ((,class (:background "#FFB6C6"))))
+ `(ahs-plugin-defalt-face ((,class (:background "#FFE4FF")))) ; Current.
+ `(anzu-match-1 ((,class (:foreground "black" :background "aquamarine"))))
+ `(anzu-match-2 ((,class (:foreground "black" :background "springgreen"))))
+ `(anzu-match-3 ((,class (:foreground "black" :background "red"))))
+ `(anzu-mode-line ((,class (:foreground "black" :background "#80FF80"))))
+ `(anzu-mode-line-no-match ((,class (:foreground "black" :background "#FF8080"))))
+ `(anzu-replace-highlight ((,class (:inherit query-replace))))
+ `(anzu-replace-to ((,class (:weight bold :foreground "#BD33FD" :background "#FDBD33"))))
`(auto-dim-other-buffers-face ((,class (:background "#F7F7F7"))))
+ `(avy-background-face ((,class (:background "#A9A9A9"))))
+ `(avy-lead-face ((,class (:weight bold :foreground "black" :background "#FEA500"))))
`(bbdb-company ((,class (:slant italic :foreground "steel blue"))))
`(bbdb-field-name ((,class (:weight bold :foreground "steel blue"))))
`(bbdb-field-value ((,class (:foreground "steel blue"))))
`(bbdb-name ((,class (:underline t :foreground "#FF6633"))))
- `(bmkp-light-autonamed ((,class (:background "#C2DDFD"))))
- `(bmkp-light-fringe-autonamed ((,class (:background "#90AFD5"))))
- `(bmkp-light-fringe-non-autonamed ((,class (:background "#D5FFD5"))))
- `(bmkp-light-non-autonamed ((,class (:background "#C4FFC4"))))
- `(browse-kill-ring-separator-face ((,class (:weight bold :foreground "slate gray"))))
+ `(bmkp-light-autonamed ((,class (:background "#F0F0F0"))))
+ `(bmkp-light-fringe-autonamed ((,class (:foreground "#5A5A5A" :background "#D4D4D4"))))
+ `(bmkp-light-fringe-non-autonamed ((,class (:foreground "#FFFFCC" :background "#01FFFB")))) ; default
+ `(bmkp-light-non-autonamed ((,class (:background "#BFFFFE"))))
+ `(bmkp-no-local ((,class (:background "pink"))))
+ `(browse-kill-ring-separator-face ((,class (:foreground "red"))))
+ `(calendar-month-header ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
`(calendar-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(calendar-weekday-header ((,class (:weight bold :foreground "#1662AF"))))
+ `(calendar-weekend-header ((,class (:weight bold :foreground "#4E4E4E"))))
`(cfw:face-annotation ((,class (:foreground "green" :background "red"))))
`(cfw:face-day-title ((,class (:foreground "#C9C9C9"))))
`(cfw:face-default-content ((,class (:foreground "#2952A3"))))
@@ -299,12 +388,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(cfw:face-sunday ((,class (:foreground "#4E4E4E" :background "white" :weight bold))))
`(cfw:face-title ((,class (:height 2.0 :foreground "#676767" :weight bold :inherit variable-pitch))))
`(cfw:face-today ((,class (:foreground "#4F4A3D" :background "#FFFFCC"))))
- `(cfw:face-today-title ((,class (:foreground "#4A95EB" :background "#FFFFCC"))))
+ `(cfw:face-today-title ((,class (:foreground "white" :background "#1766B1"))))
`(cfw:face-toolbar ((,class (:background "white"))))
`(cfw:face-toolbar-button-off ((,class (:foreground "#CFCFCF" :background "white"))))
`(cfw:face-toolbar-button-on ((,class (:foreground "#5E5E5E" :background "#F6F6F6"))))
- `(change-log-date-face ((,class (:foreground "purple"))))
+ `(change-log-date ((,class (:foreground "purple"))))
`(change-log-file ((,class (:weight bold :foreground "#4183C4"))))
+ `(change-log-list ((,class (:foreground "black" :background "#75EEC7"))))
+ `(change-log-name ((,class (:foreground "#008000"))))
`(circe-highlight-all-nicks-face ((,class (:foreground "blue" :background "#F0F0F0")))) ; other nick names
`(circe-highlight-nick-face ((,class (:foreground "#009300" :background "#F0F0F0")))) ; messages with my nick cited
`(circe-my-message-face ((,class (:foreground "#8B8B8B" :background "#F0F0F0"))))
@@ -314,15 +405,38 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(comint-highlight-input ((,class (:weight bold :foreground "#0000FF" :inherit nil))))
;; `(comint-highlight-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(comint-highlight-prompt ((,class (:weight bold :foreground "#0000FF" :inherit nil))))
- `(company-preview-common ((,class (:foreground "#C0C0C0" :background "#FFFFD7")))) ; same background as highlight-line
- `(company-tooltip-annotation ((,class (:foreground "#999999" :background "cornsilk"))))
- `(company-tooltip-common ((,class (:weight bold :inherit company-tooltip))))
- `(company-tooltip-common-selection ((,class (:weight bold :inherit company-tooltip-selection))))
+
+ ;; `(ac-selection-face ((,class ,completion-selected-candidate)))
+ `(ac-selection-face ((,class (:weight bold :foreground "white" :background "orange")))) ; TEMP For diff'ing AC from Comp.
+ `(ac-candidate-face ((,class ,completion-other-candidates)))
+ `(ac-completion-face ((,class ,completion-inline)))
+ `(ac-candidate-mouse-face ((,class (:inherit highlight))))
+ `(popup-scroll-bar-background-face ((,class (:background "#EBF4FE"))))
+ `(popup-scroll-bar-foreground-face ((,class (:background "#D1DAE4")))) ; Scrollbar (visible).
+
+ `(company-tooltip-common-selection ((,class (:weight normal :foreground "#F9ECCC" :inherit company-tooltip-selection)))) ; Prefix + common part in tooltip (for selection).
+ `(company-tooltip-selection ((,class ,completion-selected-candidate))) ; Suffix in tooltip (for selection).
+ `(company-tooltip-annotation-selection ((,class (:weight normal :foreground "#F9ECCC")))) ; Annotation (for selection).
+
+ `(company-tooltip-common ((,class (:weight normal :foreground "#B000B0" :inherit company-tooltip)))) ; Prefix + common part in tooltip.
+ `(company-tooltip ((,class ,completion-other-candidates))) ; Suffix in tooltip.
+ `(company-tooltip-annotation ((,class (:weight normal :foreground "#2415FF")))) ; Annotation.
+
+ `(company-preview-common ((,class ,completion-inline)))
+
+ `(company-scrollbar-bg ((,class (:background "#EBF4FE"))))
+ `(company-scrollbar-fg ((,class (:background "#D1DAE4")))) ; Scrollbar (visible).
+
`(compare-windows ((,class (:background "#FFFF00"))))
- `(compilation-error ((,class (:weight bold :foreground "red"))))
- `(compilation-info ((,class (:weight bold :foreground "#2A489E")))) ; used for grep
- `(compilation-line-number ((,class (:weight bold :foreground "#A535AE"))))
+ ;; `(completions-common-part ((,class (:foreground "red" :weight bold))))
+ ;; `(completions-first-difference ((,class (:foreground "green" :weight bold))))
+ `(compilation-error ((,class (:weight bold :foreground "red")))) ; Used for grep error messages.
+ `(compilation-info ((,class ,grep-file-name)))
+ `(compilation-line-number ((,class ,grep-line-number)))
`(compilation-warning ((,class (:weight bold :foreground "orange"))))
+ `(compilation-mode-line-exit ((,class (:weight bold :foreground "green")))) ; :exit[matched]
+ `(compilation-mode-line-fail ((,class (:weight bold :foreground "violet")))) ; :exit[no match]
+ `(compilation-mode-line-run ((,class (:weight bold :foreground "orange")))) ; :run
`(css-property ((,class (:foreground "#00AA00"))))
`(css-selector ((,class (:weight bold :foreground "blue"))))
`(custom-button ((,class (:box (:line-width 2 :style released-button) :foreground "black" :background "lightgrey"))))
@@ -348,11 +462,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(custom-variable-button ((,class (:weight bold :underline t))))
`(custom-variable-tag ((,class (:family "Sans Serif" :height 1.2 :weight bold :foreground "blue1"))))
`(custom-visibility ((,class ,link)))
- `(diff-hl-change ((,class (:foreground "blue3" :inherit diff-changed))))
- `(diff-hl-delete ((,class (:foreground "red3" :inherit diff-removed))))
- `(diff-hl-dired-change ((,class (:background "#FFA335" :foreground "black" :weight bold))))
+ `(diff-hl-change ((,class (:foreground "blue3" :background "#DBEDFF"))))
+ `(diff-hl-delete ((,class (:foreground "red3" :background "#FFDCE0"))))
+ `(diff-hl-dired-change ((,class (:weight bold :foreground "black" :background "#FFA335"))))
+ `(diff-hl-dired-delete ((,class (:weight bold :foreground "#D73915"))))
+ `(diff-hl-dired-ignored ((,class (:weight bold :foreground "white" :background "#C0BBAB"))))
+ `(diff-hl-dired-insert ((,class (:weight bold :foreground "#B9B9BA"))))
`(diff-hl-dired-unknown ((,class (:foreground "white" :background "#3F3BB4"))))
- `(diff-hl-insert ((,class (:foreground "green4" :inherit diff-added))))
+ `(diff-hl-insert ((,class (:foreground "green4" :background "#CDFFD8"))))
`(diff-hl-unknown ((,class (:foreground "white" :background "#3F3BB4"))))
`(diary-face ((,class (:foreground "#87C9FC"))))
`(dircolors-face-asm ((,class (:foreground "black"))))
@@ -385,17 +502,36 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(diredp-compressed-file-suffix ((,class (:foreground "red"))))
`(diredp-date-time ((,class (:foreground "purple"))))
`(diredp-dir-heading ((,class ,directory)))
+ `(diredp-dir-name ((,class ,directory)))
`(diredp-dir-priv ((,class ,directory)))
`(diredp-exec-priv ((,class (:background "#03C03C"))))
`(diredp-executable-tag ((,class (:foreground "ForestGreen" :background "white"))))
- `(diredp-file-name ((,class (:foreground "black"))))
+ `(diredp-file-name ((,class ,file)))
`(diredp-file-suffix ((,class (:foreground "#C0C0C0"))))
`(diredp-flag-mark-line ((,class ,marked-line)))
`(diredp-ignored-file-name ((,class ,shadow)))
`(diredp-read-priv ((,class (:background "#0A99FF"))))
`(diredp-write-priv ((,class (:foreground "white" :background "#FF4040"))))
+ `(eldoc-highlight-function-argument ((,class (:weight bold :foreground "red" :background "#FFE4FF"))))
+ `(elfeed-search-filter-face ((,class (:foreground "gray"))))
+ ;; `(eww-form-checkbox ((,class ())))
+ ;; `(eww-form-select ((,class ())))
+ ;; `(eww-form-submit ((,class ())))
+ `(eww-form-text ((,class (:weight bold :foreground "#40586F" :background "#A7CDF1"))))
+ ;; `(eww-form-textarea ((,class ())))
`(file-name-shadow ((,class ,shadow)))
+ `(flycheck-error ((,class (:underline (:color "#FE251E" :style wave) :weight bold :background "#FFE1E1"))))
+ `(flycheck-error-list-line-number ((,class (:foreground "#A535AE"))))
+ `(flycheck-fringe-error ((,class (:foreground "#FE251E"))))
+ `(flycheck-fringe-info ((,class (:foreground "#158A15"))))
+ `(flycheck-fringe-warning ((,class (:foreground "#F4A939"))))
+ `(flycheck-info ((,class (:underline (:color "#158A15" :style wave) :weight bold))))
+ `(flycheck-warning ((,class (:underline (:color "#F4A939" :style wave) :weight bold :background "#FFFFBE"))))
`(font-latex-bold-face ((,class (:weight bold :foreground "black"))))
+ `(fancy-narrow-blocked-face ((,class (:foreground "#9998A4"))))
+ `(flycheck-color-mode-line-error-face ((, class (:background "#CF5B56"))))
+ `(flycheck-color-mode-line-warning-face ((, class (:background "#EBC700"))))
+ `(flycheck-color-mode-line-info-face ((, class (:background "yellow"))))
`(font-latex-italic-face ((,class (:slant italic :foreground "#1A1A1A"))))
`(font-latex-math-face ((,class (:foreground "blue"))))
`(font-latex-sectioning-1-face ((,class (:family "Sans Serif" :height 2.7 :weight bold :foreground "cornflower blue"))))
@@ -408,36 +544,65 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(font-latex-verbatim-face ((,class (:foreground "#000088" :background "#FFFFE0" :inherit nil))))
`(git-commit-summary-face ((,class (:foreground "#000000"))))
`(git-commit-comment-face ((,class (:slant italic :foreground "#696969"))))
+ `(git-timemachine-commit ((,class ,diff-removed)))
+ `(git-timemachine-minibuffer-author-face ((,class ,diff-added)))
+ `(git-timemachine-minibuffer-detail-face ((,class ,diff-header)))
+ `(google-translate-text-face ((,class (:foreground "#777777" :background "#F5F5F5"))))
+ `(google-translate-phonetic-face ((,class (:inherit shadow))))
+ `(google-translate-translation-face ((,class (:weight normal :foreground "#3079ED" :background "#E3EAF2"))))
+ `(google-translate-suggestion-label-face ((,class (:foreground "red"))))
+ `(google-translate-suggestion-face ((,class (:slant italic :underline t))))
+ `(google-translate-listen-button-face ((,class (:height 0.8))))
`(helm-action ((,class (:foreground "black"))))
+ `(helm-bookmark-file ((,class ,file)))
`(helm-bookmarks-su-face ((,class (:foreground "red"))))
+ `(helm-buffer-directory ((,class ,directory)))
+ ;; `(helm-non-file-buffer ((,class (:slant italic :foreground "blue"))))
+ ;; `(helm-buffer-file ((,class (:foreground "#333333"))))
+ `(helm-buffer-modified ((,class (:slant italic :foreground "#BA36A5"))))
`(helm-buffer-process ((,class (:foreground "#008200"))))
`(helm-candidate-number ((,class (:foreground "black" :background "#FFFF66"))))
`(helm-dir-heading ((,class (:foreground "blue" :background "pink"))))
`(helm-dir-priv ((,class (:foreground "dark red" :background "light grey"))))
`(helm-ff-directory ((,class ,directory)))
+ `(helm-ff-dotted-directory ((,class ,directory)))
`(helm-ff-executable ((,class (:foreground "green3" :background "white"))))
`(helm-ff-file ((,class (:foreground "black"))))
`(helm-ff-invalid-symlink ((,class (:foreground "yellow" :background "red"))))
`(helm-ff-symlink ((,class ,symlink)))
`(helm-file-name ((,class (:foreground "blue"))))
`(helm-gentoo-match-face ((,class (:foreground "red"))))
+ `(helm-grep-file ((,class ,grep-file-name)))
+ `(helm-grep-lineno ((,class ,grep-line-number)))
`(helm-grep-match ((,class ,match)))
`(helm-grep-running ((,class (:weight bold :foreground "white"))))
- `(helm-grep-lineno ((,class ,shadow)))
`(helm-isearch-match ((,class (:background "#CCFFCC"))))
+ `(helm-lisp-show-completion ((,class ,volatile-highlight-supersize))) ; See `helm-dabbrev'.
+ ;; `(helm-ls-git-added-copied-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-added-modified-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-conflict-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-deleted-and-staged-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-deleted-not-staged-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-modified-and-staged-face ((,class (:foreground ""))))
+ `(helm-ls-git-modified-not-staged-face ((,class (:foreground "#BA36A5"))))
+ ;; `(helm-ls-git-renamed-modified-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-untracked-face ((,class (:foreground ""))))
`(helm-match ((,class ,match)))
`(helm-moccur-buffer ((,class (:foreground "#0066CC"))))
- `(helm-selection ((,class ,volatile-highlight)))
- `(helm-selection-line ((,class ,volatile-highlight)))
- `(helm-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#2F69BF"))))
- `(helm-swoop-target-line-face ((,class ,volatile-highlight)))
+ `(helm-selection ((,class (:background "#3875D6" :foreground "white"))))
+ `(helm-selection-line ((,class ,highlight-gray))) ; ???
+ `(helm-separator ((,class (:foreground "red"))))
+ `(helm-source-header ((,class (:weight bold :box (:line-width 1 :color "#C7C7C7") :background "#DEDEDE" :foreground "black"))))
`(helm-swoop-target-line-block-face ((,class (:background "#CCCC00" :foreground "#222222"))))
+ `(helm-swoop-target-line-face ((,class (:background "#CCCCFF"))))
`(helm-swoop-target-word-face ((,class (:weight bold :foreground nil :background "#FDBD33"))))
`(helm-visible-mark ((,class ,marked-line)))
`(helm-w3m-bookmarks-face ((,class (:underline t :foreground "cyan1"))))
+ `(highlight-changes ((,class (:foreground nil)))) ;; blue "#2E08B5"
+ `(highlight-changes-delete ((,class (:strike-through nil :foreground nil)))) ;; red "#B5082E"
`(highlight-symbol-face ((,class (:background "#FFFFA0"))))
- `(hl-line ((,class ,highlight-line)))
- `(hl-tags-face ((,class (:background "#FEFCAE"))))
+ `(hl-line ((,class ,highlight-yellow))) ; Highlight current line.
+ `(hl-tags-face ((,class ,highlight-current-tag))) ; ~ Pair highlighting (matching tags).
`(holiday-face ((,class (:foreground "#777777" :background "#E4EBFE"))))
`(html-helper-bold-face ((,class (:weight bold :foreground "black"))))
`(html-helper-italic-face ((,class (:slant italic :foreground "black"))))
@@ -448,9 +613,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(ilog-echo-face ((,class (:height 2.0 :foreground "#006FE0"))))
`(ilog-load-face ((,class (:foreground "#BA36A5"))))
`(ilog-message-face ((,class (:foreground "#808080"))))
+ `(indent-guide-face ((,class (:foreground "#D3D3D3"))))
`(info-file ((,class (:family "Sans Serif" :height 1.8 :weight bold :box (:line-width 1 :color "#0000CC") :foreground "cornflower blue" :background "LightSteelBlue1"))))
`(info-header-node ((,class (:underline t :foreground "orange")))) ; nodes in header
`(info-header-xref ((,class (:underline t :foreground "dodger blue")))) ; cross references in header
+ `(info-index-match ((,class (:weight bold :foreground nil :background "#FDBD33")))) ; when using `i'
`(info-menu-header ((,class ,ol2))) ; menu titles (headers) -- major topics
`(info-menu-star ((,class (:foreground "black")))) ; every 3rd menu item
`(info-node ((,class (:underline t :foreground "blue")))) ; node names
@@ -459,16 +626,48 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(info-title-1 ((,class ,ol1)))
`(info-xref ((,class (:underline t :foreground "#006DAF")))) ; unvisited cross-references
`(info-xref-visited ((,class (:underline t :foreground "magenta4")))) ; previously visited cross-references
+ ;; js2-highlight-vars-face (~ auto-highlight-symbol)
+ `(js2-error ((,class (:box (:line-width 1 :color "#FF3737") :background "#FFC8C8")))) ; DONE.
+ `(js2-external-variable ((,class (:foreground "#FF0000" :background "#FFF8F8")))) ; DONE.
+ `(js2-function-param ((,class ,function-param)))
+ `(js2-instance-member ((,class (:foreground "DarkOrchid"))))
+ `(js2-jsdoc-html-tag-delimiter ((,class (:foreground "#D0372D"))))
+ `(js2-jsdoc-html-tag-name ((,class (:foreground "#D0372D"))))
+ `(js2-jsdoc-tag ((,class (:weight normal :foreground "#6434A3"))))
+ `(js2-jsdoc-type ((,class (:foreground "SteelBlue"))))
+ `(js2-jsdoc-value ((,class (:weight normal :foreground "#BA36A5")))) ; #800080
+ `(js2-magic-paren ((,class (:underline t))))
+ `(js2-private-function-call ((,class (:foreground "goldenrod"))))
+ `(js2-private-member ((,class (:foreground "PeachPuff3"))))
+ `(js2-warning ((,class (:underline "orange"))))
+
+ ;; Org non-standard faces.
+ `(leuven-org-deadline-overdue ((,class (:foreground "#F22659"))))
+ `(leuven-org-deadline-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(leuven-org-deadline-tomorrow ((,class (:foreground "#40A80B"))))
+ `(leuven-org-deadline-future ((,class (:foreground "#40A80B"))))
+ `(leuven-gnus-unseen ((,class (:weight bold :foreground "#FC7202"))))
+ `(leuven-gnus-date ((,class (:foreground "#FF80BF"))))
+ `(leuven-gnus-size ((,class (:foreground "#8FBF60"))))
+ `(leuven-todo-items-face ((,class (:weight bold :foreground "#FF3125" :background "#FFFF88"))))
+
`(light-symbol-face ((,class (:background "#FFFFA0"))))
- `(linum ((,class (:inherit (default shadow) :foreground "#9A9A9A" :background "#EDEDED"))))
+ `(linum ((,class (:foreground "#9A9A9A" :background "#EDEDED"))))
`(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
+ `(log-view-message ((,class (:foreground "black" :background "#EDEA74"))))
`(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"))))
+ `(magit-blame-header ((,class (:inherit magit-diff-file-header))))
+ `(magit-blame-heading ((,class (:overline "#A7A7A7" :foreground "red" :background "#E6E6E6"))))
+ `(magit-blame-hash ((,class (:overline "#A7A7A7" :foreground "red" :background "#E6E6E6"))))
+ `(magit-blame-name ((,class (:overline "#A7A7A7" :foreground "#036A07" :background "#E6E6E6"))))
+ `(magit-blame-date ((,class (:overline "#A7A7A7" :foreground "blue" :background "#E6E6E6"))))
+ `(magit-blame-summary ((,class (:overline "#A7A7A7" :weight bold :foreground "#707070" :background "#E6E6E6"))))
`(magit-branch ((,class ,vc-branch)))
`(magit-diff-add ((,class ,diff-added)))
`(magit-diff-del ((,class ,diff-removed)))
- `(magit-diff-file-header ((,class (:family "Sans Serif" :height 1.1 :weight bold :foreground "#4183C4"))))
+ `(magit-diff-file-header ((,class (:height 1.1 :weight bold :foreground "#4183C4"))))
`(magit-diff-hunk-header ((,class ,diff-hunk-header)))
`(magit-diff-none ((,class ,diff-none)))
`(magit-header ((,class (:foreground "white" :background "#FF4040"))))
@@ -479,45 +678,78 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(magit-section-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "cornflower blue" :inherit nil))))
`(makefile-space-face ((,class (:background "hot pink"))))
`(makefile-targets ((,class (:weight bold :foreground "blue"))))
- `(match ((,class ,match)))
+ ;; `(markdown-blockquote-face ((,class ())))
+ `(markdown-bold-face ((,class (:inherit bold))))
+ ;; `(markdown-comment-face ((,class ())))
+ ;; `(markdown-footnote-face ((,class ())))
+ ;; `(markdown-header-delimiter-face ((,class ())))
+ ;; `(markdown-header-face ((,class ())))
+ `(markdown-header-face-1 ((,class ,ol1)))
+ `(markdown-header-face-2 ((,class ,ol2)))
+ `(markdown-header-face-3 ((,class ,ol3)))
+ `(markdown-header-face-4 ((,class ,ol4)))
+ `(markdown-header-face-5 ((,class ,ol5)))
+ `(markdown-header-face-6 ((,class ,ol6)))
+ ;; `(markdown-header-rule-face ((,class ())))
+ `(markdown-inline-code-face ((,class ,code-inline)))
+ `(markdown-italic-face ((,class (:inherit italic))))
+ `(markdown-language-keyword-face ((,class (:inherit org-block-begin-line))))
+ ;; `(markdown-line-break-face ((,class ())))
+ `(markdown-link-face ((,class ,link-no-underline)))
+ ;; `(markdown-link-title-face ((,class ())))
+ ;; `(markdown-list-face ((,class ())))
+ ;; `(markdown-math-face ((,class ())))
+ ;; `(markdown-metadata-key-face ((,class ())))
+ ;; `(markdown-metadata-value-face ((,class ())))
+ ;; `(markdown-missing-link-face ((,class ())))
+ `(markdown-pre-face ((,class (:inherit org-block-background))))
+ ;; `(markdown-reference-face ((,class ())))
+ ;; `(markdown-strike-through-face ((,class ())))
+ `(markdown-url-face ((,class ,link)))
+ `(match ((,class ,match))) ; Used for grep matches.
+ `(mc/cursor-bar-face ((,class (:height 1.0 :foreground "#1664C4" :background "#1664C4"))))
+ `(mc/cursor-face ((,class (:inverse-video t))))
+ `(mc/region-face ((,class (:inherit region))))
`(mm-uu-extract ((,class ,code-block)))
`(moccur-current-line-face ((,class (:foreground "black" :background "#FFFFCC"))))
`(moccur-face ((,class (:foreground "black" :background "#FFFF99"))))
- `(next-error ((,class ,volatile-highlight)))
+ `(next-error ((,class ,volatile-highlight-supersize)))
`(nobreak-space ((,class (:background "#CCE8F6"))))
- `(nxml-attribute-local-name-face ((,class (:foreground "magenta"))))
+ `(nxml-attribute-local-name-face ((,class ,xml-attribute)))
`(nxml-attribute-value-delimiter-face ((,class (:foreground "green4"))))
`(nxml-attribute-value-face ((,class (:foreground "green4"))))
`(nxml-comment-content-face ((,class (:slant italic :foreground "red"))))
`(nxml-comment-delimiter-face ((,class (:foreground "red"))))
- `(nxml-element-local-name ((,class (:box (:line-width 1 :color "#999999") :foreground "#000088" :background "#DEDEDE"))))
+ `(nxml-element-local-name ((,class ,xml-tag)))
`(nxml-element-local-name-face ((,class (:foreground "blue"))))
`(nxml-processing-instruction-target-face ((,class (:foreground "purple1"))))
`(nxml-tag-delimiter-face ((,class (:foreground "blue"))))
`(nxml-tag-slash-face ((,class (:foreground "blue"))))
`(org-agenda-block-count ((,class (:weight bold :foreground "#A5A5A5"))))
- `(org-agenda-calendar-event ((,class (:weight bold :foreground "#3774CC" :background "#A8C5EF"))))
- `(org-agenda-calendar-sexp ((,class (:foreground "#777777" :background "#E4EBFE"))))
+ `(org-agenda-calendar-event ((,class (:weight bold :foreground "#3774CC" :background "#E4EBFE"))))
+ `(org-agenda-calendar-sexp ((,class (:foreground "#327ACD" :background "#F3F7FC"))))
`(org-agenda-clocking ((,class (:foreground "black" :background "#EEC900"))))
`(org-agenda-column-dateline ((,class ,column)))
`(org-agenda-current-time ((,class (:underline t :foreground "#1662AF"))))
- `(org-agenda-date ((,class (:height 1.6 :weight bold :foreground "#1662AF"))))
- `(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
- `(org-agenda-date-weekend ((,class (:height 1.6 :weight bold :foreground "#4E4E4E"))))
+ `(org-agenda-date ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#1662AF"))))
+ `(org-agenda-date-today ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(org-agenda-date-weekend ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#4E4E4E"))))
`(org-agenda-diary ((,class (:weight bold :foreground "green4" :background "light blue"))))
`(org-agenda-dimmed-todo-face ((,class (:foreground "gold2"))))
`(org-agenda-done ((,class (:foreground "#555555"))))
`(org-agenda-filter-category ((,class (:weight bold :foreground "orange"))))
+ `(org-agenda-filter-effort ((,class (:weight bold :foreground "orange"))))
+ `(org-agenda-filter-regexp ((,class (:weight bold :foreground "orange"))))
`(org-agenda-filter-tags ((,class (:weight bold :foreground "orange"))))
`(org-agenda-restriction-lock ((,class (:background "#E77D63"))))
- `(org-agenda-structure ((,class (:height 1.6 :weight bold :foreground "#1F8DD6"))))
+ `(org-agenda-structure ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#1F8DD6"))))
`(org-archived ((,class (:foreground "gray70"))))
`(org-beamer-tag ((,class (:box (:line-width 1 :color "#FABC18") :foreground "#2C2C2C" :background "#FFF8D0"))))
`(org-block ((,class ,code-block)))
- `(org-block-background ((,class (:background "#FFFFE0"))))
- `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
- `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
- `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "white" :background "#777777"))))
+ `(org-block-background ((,class (:background "#FFFFE0" :extend t)))) ;; :inherit fixed-pitch))))
+ `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5" :extend t))))
+ `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5" :extend t))))
+ `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "#123555" :background "#A3A3A3"))))
`(org-clock-overlay ((,class (:foreground "white" :background "SkyBlue4"))))
`(org-code ((,class ,code-inline)))
`(org-column ((,class ,column)))
@@ -527,14 +759,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(org-dim ((,class (:foreground "#AAAAAA"))))
`(org-document-info ((,class (:foreground "#484848"))))
`(org-document-info-keyword ((,class (:foreground "#008ED1" :background "#EAEAFF"))))
- `(org-document-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "black"))))
+ `(org-document-title ((,class (:height 1.8 :weight bold :foreground "black"))))
`(org-done ((,class (:weight bold :box (:line-width 1 :color "#BBBBBB") :foreground "#BBBBBB" :background "#F0F0F0"))))
- `(org-drawer ((,class (:foreground "light sky blue"))))
- `(org-ellipsis ((,class (:underline nil :box (:line-width 1 :color "#999999") :foreground "#999999" :background "#FFF8C0")))) ; #FFEE62
+ `(org-drawer ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA" :extend nil))))
+ `(org-ellipsis ((,class (:underline nil :foreground "#999999")))) ; #FFEE62
`(org-example ((,class (:foreground "blue" :background "#EAFFEA"))))
`(org-footnote ((,class (:underline t :foreground "#008ED1"))))
`(org-formula ((,class (:foreground "chocolate1"))))
- `(org-headline-done ((,class (:height 1.0 :weight normal :strike-through t :foreground "#ADADAD"))))
+ `(org-headline-done ((,class (:height 1.0 :weight normal :foreground "#ADADAD"))))
`(org-hide ((,class (:foreground "#E2E2E2"))))
`(org-inlinetask ((,class (:box (:line-width 1 :color "#EBEBEB") :foreground "#777777" :background "#FFFFD6"))))
`(org-latex-and-related ((,class (:foreground "#336699" :background "white"))))
@@ -548,25 +780,25 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(org-level-8 ((,class ,ol8)))
`(org-link ((,class ,link)))
`(org-list-dt ((,class (:weight bold :foreground "#335EA8"))))
- `(org-macro ((,class (:foreground "white" :background "#EDB802"))))
+ `(org-macro ((,class (:weight bold :foreground "#EDB802"))))
`(org-meta-line ((,class (:slant normal :foreground "#008ED1" :background "#EAEAFF"))))
- `(org-mode-line-clock ((,class ,clock-line)))
+ `(org-mode-line-clock ((,class (:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#FFA335"))))
`(org-mode-line-clock-overrun ((,class (:weight bold :box (:line-width 1 :color "#335EA8") :foreground "white" :background "#FF4040"))))
`(org-number-of-items ((,class (:weight bold :foreground "white" :background "#79BA79"))))
`(org-property-value ((,class (:foreground "#00A000"))))
`(org-quote ((,class (:slant italic :foreground "dim gray" :background "#FFFFE0"))))
`(org-scheduled ((,class (:foreground "#333333"))))
- `(org-scheduled-previously ((,class (:foreground "#F22659"))))
+ `(org-scheduled-previously ((,class (:foreground "#1466C6"))))
`(org-scheduled-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
`(org-sexp-date ((,class (:foreground "#3774CC"))))
`(org-special-keyword ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA"))))
- `(org-table ((,class (:foreground "dark green" :background "#EAFFEA"))))
+ `(org-table ((,class (:foreground "dark green" :background "#EAFFEA")))) ;; :inherit fixed-pitch))))
`(org-tag ((,class (:weight normal :slant italic :foreground "#9A9FA4" :background "white"))))
- `(org-target ((,class ,link)))
+ `(org-target ((,class (:foreground "#FF6DAF"))))
`(org-time-grid ((,class (:foreground "#CFCFCF"))))
`(org-todo ((,class (:weight bold :box (:line-width 1 :color "#D8ABA7") :foreground "#D8ABA7" :background "#FFE6E4"))))
`(org-upcoming-deadline ((,class (:foreground "#FF5555"))))
- `(org-verbatim ((,class (:foreground "#0066CC"))))
+ `(org-verbatim ((,class (:foreground "#0066CC" :background "#F7FDFF"))))
`(org-verse ((,class (:slant italic :foreground "dim gray" :background "#EEEEEE"))))
`(org-warning ((,class (:weight bold :foreground "black" :background "#CCE7FF"))))
`(outline-1 ((,class ,ol1)))
@@ -577,17 +809,17 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(outline-6 ((,class ,ol6)))
`(outline-7 ((,class ,ol7)))
`(outline-8 ((,class ,ol8)))
- `(pabbrev-debug-display-label-face ((,class (:background "chartreuse"))))
+ `(pabbrev-debug-display-label-face ((,class (:foreground "white" :background "#A62154"))))
`(pabbrev-suggestions-face ((,class (:weight bold :foreground "white" :background "red"))))
`(pabbrev-suggestions-label-face ((,class (:weight bold :foreground "white" :background "purple"))))
`(paren-face-match ((,class ,paren-matched)))
`(paren-face-mismatch ((,class ,paren-unmatched)))
`(paren-face-no-match ((,class ,paren-unmatched)))
`(persp-selected-face ((,class (:weight bold :foreground "#EEF5FE"))))
- `(powerline-active1 ((,class (:background "grey22" :inherit mode-line))))
- `(powerline-active2 ((,class (:background "#4070B6" :inherit mode-line))))
- `(powerline-inactive1 ((,class (:background "#686868" :inherit mode-line-inactive))))
- `(powerline-inactive2 ((,class (:background "#A9A9A9" :inherit mode-line-inactive))))
+ `(powerline-active1 ((,class (:foreground "#85CEEB" :background "#383838" :inherit mode-line))))
+ `(powerline-active2 ((,class (:foreground "#85CEEB" :background "#4070B6" :inherit mode-line))))
+ `(powerline-inactive1 ((,class (:foreground "#F0F0EF" :background "#686868" :inherit mode-line-inactive))))
+ `(powerline-inactive2 ((,class (:foreground "#F0F0EF" :background "#A9A9A9" :inherit mode-line-inactive))))
`(rainbow-delimiters-depth-1-face ((,class (:foreground "#707183"))))
`(rainbow-delimiters-depth-2-face ((,class (:foreground "#7388D6"))))
`(rainbow-delimiters-depth-3-face ((,class (:foreground "#909183"))))
@@ -599,29 +831,33 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(rainbow-delimiters-depth-9-face ((,class (:foreground "#887070"))))
`(rainbow-delimiters-mismatched-face ((,class ,paren-unmatched)))
`(rainbow-delimiters-unmatched-face ((,class ,paren-unmatched)))
- `(realgud-overlay-arrow1 ((,class (:foreground "#005522"))))
- `(realgud-overlay-arrow2 ((,class (:foreground "#c18401"))))
- `(realgud-overlay-arrow3 ((,class (:foreground "#909183"))))
- `(realgud-bp-disabled-face ((,class (:foreground "#909183"))))
- `(realgud-bp-line-enabled-face ((,class (:underline "red"))))
- `(realgud-bp-line-disabled-face ((,class (:underline "#909183"))))
- `(realgud-file-name ((,class :foreground "#005522")))
- `(realgud-line-number ((,class :foreground "#A535AE")))
- `(realgud-backtrace-number ((,class :foreground "#A535AE" :weight bold)))
`(recover-this-file ((,class (:weight bold :background "#FF3F3F"))))
`(rng-error ((,class (:weight bold :foreground "red" :background "#FBE3E4"))))
`(sh-heredoc ((,class (:foreground "blue" :background "#EEF5FE"))))
`(sh-quoted-exec ((,class (:foreground "#FF1493"))))
- `(shadow ((,class ,shadow)))
+ `(shadow ((,class ,shadow))) ; Used for grep context lines.
`(shell-option-face ((,class (:foreground "forest green"))))
`(shell-output-2-face ((,class (:foreground "blue"))))
`(shell-output-3-face ((,class (:foreground "purple"))))
`(shell-output-face ((,class (:foreground "black"))))
;; `(shell-prompt-face ((,class (:weight bold :foreground "yellow"))))
+ `(shm-current-face ((,class (:background "#EEE8D5"))))
+ `(shm-quarantine-face ((,class (:background "lemonchiffon"))))
`(show-paren-match ((,class ,paren-matched)))
`(show-paren-mismatch ((,class ,paren-unmatched)))
`(sml-modeline-end-face ((,class (:background "#6BADF6")))) ; #335EA8
`(sml-modeline-vis-face ((,class (:background "#1979CA"))))
+ `(term ((,class (:foreground "#333333" :background "#FFFFFF"))))
+
+ ;; `(sp-pair-overlay-face ((,class ())))
+ ;; `(sp-show-pair-enclosing ((,class ())))
+ ;; `(sp-show-pair-match-face ((,class ()))) ; ~ Pair highlighting (matching tags).
+ ;; `(sp-show-pair-mismatch-face ((,class ())))
+ ;; `(sp-wrap-overlay-closing-pair ((,class ())))
+ ;; `(sp-wrap-overlay-face ((,class ())))
+ ;; `(sp-wrap-overlay-opening-pair ((,class ())))
+ ;; `(sp-wrap-tag-overlay-face ((,class ())))
+
`(speedbar-button-face ((,class (:foreground "green4"))))
`(speedbar-directory-face ((,class (:foreground "blue4"))))
`(speedbar-file-face ((,class (:foreground "cyan4"))))
@@ -639,7 +875,6 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(tex-verbatim ((,class (:foreground "blue"))))
`(tool-bar ((,class (:box (:line-width 1 :style released-button) :foreground "black" :background "gray75"))))
`(tooltip ((,class (:foreground "black" :background "light yellow"))))
- `(trailing-whitespace ((,class (:background "#F6EBFE"))))
`(traverse-match-face ((,class (:weight bold :foreground "blue violet"))))
`(vc-annotate-face-3F3FFF ((,class (:foreground "#3F3FFF" :background "black"))))
`(vc-annotate-face-3F6CFF ((,class (:foreground "#3F3FFF" :background "black"))))
@@ -654,11 +889,24 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(vc-annotate-face-83FF3F ((,class (:foreground "#B0FF3F" :background "black"))))
`(vc-annotate-face-B0FF3F ((,class (:foreground "#B0FF3F" :background "black"))))
`(vc-annotate-face-DDFF3F ((,class (:foreground "#FFF33F" :background "black"))))
+ `(vc-annotate-face-F6FFCC ((,class (:foreground "black" :background "#FFFFC0"))))
`(vc-annotate-face-FF3F3F ((,class (:foreground "#FF3F3F" :background "black"))))
`(vc-annotate-face-FF6C3F ((,class (:foreground "#FF3F3F" :background "black"))))
`(vc-annotate-face-FF993F ((,class (:foreground "#FF993F" :background "black"))))
`(vc-annotate-face-FFC63F ((,class (:foreground "#FF993F" :background "black"))))
`(vc-annotate-face-FFF33F ((,class (:foreground "#FFF33F" :background "black"))))
+
+ ;; ;; vc
+ ;; (vc-up-to-date-state ((,c :foreground ,(gc 'green-1))))
+ ;; (vc-edited-state ((,c :foreground ,(gc 'yellow+1))))
+ ;; (vc-missing-state ((,c :foreground ,(gc 'red))))
+ ;; (vc-conflict-state ((,c :foreground ,(gc 'red+2) :weight bold)))
+ ;; (vc-locked-state ((,c :foreground ,(gc 'cyan-1))))
+ ;; (vc-locally-added-state ((,c :foreground ,(gc 'blue))))
+ ;; (vc-needs-update-state ((,c :foreground ,(gc 'magenta))))
+ ;; (vc-removed-state ((,c :foreground ,(gc 'red-1))))
+
+ `(vhl/default-face ((,class ,volatile-highlight))) ; `volatile-highlights.el' (for undo, yank).
`(w3m-anchor ((,class ,link)))
`(w3m-arrived-anchor ((,class (:foreground "purple1"))))
`(w3m-bitmap-image-face ((,class (:foreground "gray4" :background "green"))))
@@ -675,38 +923,139 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(w3m-link-numbering ((,class (:foreground "#B4C7EB")))) ; mouseless browsing
`(w3m-strike-through-face ((,class (:strike-through t))))
`(w3m-underline-face ((,class (:underline t))))
- `(which-func ((,class (:weight bold :foreground "white"))))
+
+ ;; `(web-mode-block-attr-name-face ((,class ())))
+ ;; `(web-mode-block-attr-value-face ((,class ())))
+ ;; `(web-mode-block-comment-face ((,class ())))
+ ;; `(web-mode-block-control-face ((,class ())))
+ ;; `(web-mode-block-delimiter-face ((,class ())))
+ ;; `(web-mode-block-face ((,class ())))
+ ;; `(web-mode-block-string-face ((,class ())))
+ ;; `(web-mode-bold-face ((,class ())))
+ ;; `(web-mode-builtin-face ((,class ())))
+ ;; `(web-mode-comment-face ((,class ())))
+ ;; `(web-mode-comment-keyword-face ((,class ())))
+ ;; `(web-mode-constant-face ((,class ())))
+ ;; `(web-mode-css-at-rule-face ((,class ())))
+ ;; `(web-mode-css-color-face ((,class ())))
+ ;; `(web-mode-css-comment-face ((,class ())))
+ ;; `(web-mode-css-function-face ((,class ())))
+ ;; `(web-mode-css-priority-face ((,class ())))
+ ;; `(web-mode-css-property-name-face ((,class ())))
+ ;; `(web-mode-css-pseudo-class-face ((,class ())))
+ ;; `(web-mode-css-selector-face ((,class ())))
+ ;; `(web-mode-css-string-face ((,class ())))
+ ;; `(web-mode-css-variable-face ((,class ())))
+ ;; `(web-mode-current-column-highlight-face ((,class ())))
+ `(web-mode-current-element-highlight-face ((,class (:background "#99CCFF")))) ; #FFEE80
+ ;; `(web-mode-doctype-face ((,class ())))
+ ;; `(web-mode-error-face ((,class ())))
+ ;; `(web-mode-filter-face ((,class ())))
+ `(web-mode-folded-face ((,class (:box (:line-width 1 :color "#777777") :foreground "#9A9A6A" :background "#F3F349"))))
+ ;; `(web-mode-function-call-face ((,class ())))
+ ;; `(web-mode-function-name-face ((,class ())))
+ ;; `(web-mode-html-attr-custom-face ((,class ())))
+ ;; `(web-mode-html-attr-engine-face ((,class ())))
+ ;; `(web-mode-html-attr-equal-face ((,class ())))
+ `(web-mode-html-attr-name-face ((,class ,xml-attribute)))
+ ;; `(web-mode-html-attr-value-face ((,class ())))
+ ;; `(web-mode-html-entity-face ((,class ())))
+ `(web-mode-html-tag-bracket-face ((,class ,xml-tag)))
+ ;; `(web-mode-html-tag-custom-face ((,class ())))
+ `(web-mode-html-tag-face ((,class ,xml-tag)))
+ ;; `(web-mode-html-tag-namespaced-face ((,class ())))
+ ;; `(web-mode-inlay-face ((,class ())))
+ ;; `(web-mode-italic-face ((,class ())))
+ ;; `(web-mode-javascript-comment-face ((,class ())))
+ ;; `(web-mode-javascript-string-face ((,class ())))
+ ;; `(web-mode-json-comment-face ((,class ())))
+ ;; `(web-mode-json-context-face ((,class ())))
+ ;; `(web-mode-json-key-face ((,class ())))
+ ;; `(web-mode-json-string-face ((,class ())))
+ ;; `(web-mode-jsx-depth-1-face ((,class ())))
+ ;; `(web-mode-jsx-depth-2-face ((,class ())))
+ ;; `(web-mode-jsx-depth-3-face ((,class ())))
+ ;; `(web-mode-jsx-depth-4-face ((,class ())))
+ ;; `(web-mode-keyword-face ((,class ())))
+ ;; `(web-mode-param-name-face ((,class ())))
+ ;; `(web-mode-part-comment-face ((,class ())))
+ `(web-mode-part-face ((,class (:background "#FFFFE0"))))
+ ;; `(web-mode-part-string-face ((,class ())))
+ ;; `(web-mode-preprocessor-face ((,class ())))
+ `(web-mode-script-face ((,class (:background "#EFF0F1"))))
+ ;; `(web-mode-sql-keyword-face ((,class ())))
+ ;; `(web-mode-string-face ((,class ())))
+ ;; `(web-mode-style-face ((,class ())))
+ ;; `(web-mode-symbol-face ((,class ())))
+ ;; `(web-mode-type-face ((,class ())))
+ ;; `(web-mode-underline-face ((,class ())))
+ ;; `(web-mode-variable-name-face ((,class ())))
+ ;; `(web-mode-warning-face ((,class ())))
+ ;; `(web-mode-whitespace-face ((,class ())))
+
+ `(which-func ((,class (:weight bold :slant italic :foreground "white"))))
+ ;; `(which-key-command-description-face)
+ ;; `(which-key-group-description-face)
+ ;; `(which-key-highlighted-command-face)
+ ;; `(which-key-key-face)
+ `(which-key-local-map-description-face ((,class (:weight bold :background "#F3F7FC" :inherit which-key-command-description-face))))
+ ;; `(which-key-note-face)
+ ;; `(which-key-separator-face)
+ ;; `(which-key-special-key-face)
`(widget-button ((,class ,link)))
`(widget-button-pressed ((,class (:foreground "red"))))
`(widget-documentation ((,class (:foreground "green4"))))
`(widget-field ((,class (:background "gray85"))))
`(widget-inactive ((,class (:foreground "dim gray"))))
`(widget-single-line-field ((,class (:background "gray85"))))
- `(yas/field-debug-face ((,class (:background "ivory2"))))
- `(yas/field-highlight-face ((,class (:background "DarkSeaGreen1"))))
+ `(woman-bold ((,class (:weight bold :foreground "#F13D3D"))))
+ `(woman-italic ((,class (:weight bold :slant italic :foreground "#46BE1B"))))
+ `(woman-symbol ((,class (:weight bold :foreground "purple"))))
+ `(yas-field-debug-face ((,class (:foreground "white" :background "#A62154"))))
+ `(yas-field-highlight-face ((,class (:box (:line-width 1 :color "#838383") :foreground "black" :background "#D4DCD8"))))
+
+ ;; `(ztreep-arrow-face ((,class ())))
+ ;; `(ztreep-diff-header-face ((,class ())))
+ ;; `(ztreep-diff-header-small-face ((,class ())))
+ `(ztreep-diff-model-add-face ((,class (:weight bold :foreground "#008800"))))
+ `(ztreep-diff-model-diff-face ((,class (:weight bold :foreground "#0044DD"))))
+ `(ztreep-diff-model-ignored-face ((,class (:strike-through t :foreground "#9E9E9E"))))
+ `(ztreep-diff-model-normal-face ((,class (:foreground "#000000"))))
+ ;; `(ztreep-expand-sign-face ((,class ())))
+ ;; `(ztreep-header-face ((,class ())))
+ ;; `(ztreep-leaf-face ((,class ())))
+ ;; `(ztreep-node-face ((,class ())))
+
))
(custom-theme-set-variables 'leuven
- '(ansi-color-faces-vector
- [default default default italic underline success warning error])
- '(ansi-color-names-vector
- ["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"])
- ; colors used in Shell mode
+
+ ;; highlight-sexp-mode.
+ '(hl-sexp-background-color "#efebe9")
+
+ '(ansi-color-faces-vector
+ [default default default italic underline success warning error])
+
+ ;; Colors used in Shell mode.
+ '(ansi-color-names-vector
+ ["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"])
)
;;;###autoload
(when (and (boundp 'custom-theme-load-path)
load-file-name)
- ;; add theme folder to `custom-theme-load-path' when installing over MELPA
+ ;; Add theme folder to `custom-theme-load-path' when installing over MELPA.
(add-to-list 'custom-theme-load-path
(file-name-as-directory (file-name-directory load-file-name))))
(provide-theme 'leuven)
+;; This is for the sake of Emacs.
;; Local Variables:
+;; no-byte-compile: t
+;; time-stamp-end: "$"
;; time-stamp-format: "%:y%02m%02d.%02H%02M"
;; time-stamp-start: "Version: "
-;; time-stamp-end: "$"
;; End:
;;; leuven-theme.el ends here
--
2.21.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-04-22 19:58 ` Fab Rice
@ 2020-04-23 18:47 ` Stefan Kangas
0 siblings, 0 replies; 15+ messages in thread
From: Stefan Kangas @ 2020-04-23 18:47 UTC (permalink / raw)
To: Fab Rice; +Cc: 40759, dgutov
Fab Rice <posh18@pirilampo.be> writes:
> BTW, could this go to the "emacs-27" branch, please?
I think the emacs-27 branch is closed for anything that is not
urgent. Eli, what do you think?
A few more nitpicks:
> +(defcustom leuven-scale-org-agenda-structure t
> + "Scale Org agenda structure lines, like dates.
> +This can be nil for unscaled, t for using the theme default, or a scaling number."
The last line should be reformatted to less than 80 characters, see:
(info "(elisp) Documentation Tips")
> + :group 'leuven)
You don't need ":group 'leuven" here since it defaults to the previous
defgroup.
Best regards,
Stefan Kangas
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-04-22 5:31 bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk Fab Rice
2020-04-22 6:10 ` Stefan Kangas
2020-04-22 19:58 ` Fab Rice
@ 2020-04-24 10:57 ` Serghei via Bug reports for GNU Emacs, the Swiss army knife of text editors
2020-04-24 11:26 ` Eli Zaretskii
2 siblings, 1 reply; 15+ messages in thread
From: Serghei via Bug reports for GNU Emacs, the Swiss army knife of text editors @ 2020-04-24 10:57 UTC (permalink / raw)
To: Stefan Kangas, Fab Rice; +Cc: 40759, Eli Zaretskii, dgutov
Hello,
I asked for this merge Leuven Theme in 22 March [1] so I'm more than
interested in merging this before 27.1 release.
Eli, Stefan consider please to release Emacs 27.1 with fresh Leuven
version.
[1]: https://github.com/fniessen/emacs-leuven-theme/issues/69
> Fab Rice <posh18@pirilampo.be> writes:
>
>> BTW, could this go to the "emacs-27" branch, please?
>
> I think the emacs-27 branch is closed for anything that is not
> urgent. Eli, what do you think?
>
> A few more nitpicks:
>
>> +(defcustom leuven-scale-org-agenda-structure t
>> + "Scale Org agenda structure lines, like dates.
>> +This can be nil for unscaled, t for using the theme default, or a scaling number."
>
> The last line should be reformatted to less than 80 characters, see:
> (info "(elisp) Documentation Tips")
>
>> + :group 'leuven)
>
> You don't need ":group 'leuven" here since it defaults to the previous
> defgroup.
>
> Best regards,
> Stefan Kangas
>
>
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-04-24 10:57 ` Serghei via Bug reports for GNU Emacs, the Swiss army knife of text editors
@ 2020-04-24 11:26 ` Eli Zaretskii
2020-04-24 12:09 ` Fab Rice
0 siblings, 1 reply; 15+ messages in thread
From: Eli Zaretskii @ 2020-04-24 11:26 UTC (permalink / raw)
To: Serghei; +Cc: stefan, 40759, posh18, dgutov
> Date: Fri, 24 Apr 2020 10:57:35 +0000
> From: Serghei <egrep@protonmail.ch>
> Cc: 40759@debbugs.gnu.org, Eli Zaretskii <eliz@gnu.org>, dgutov@yandex.ru
>
> I asked for this merge Leuven Theme in 22 March [1] so I'm more than
> interested in merging this before 27.1 release.
>
> Eli, Stefan consider please to release Emacs 27.1 with fresh Leuven
> version.
What about the issues pointed out by Stefan in his message? Will an
updated patch be posted any time soon?
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-04-24 11:26 ` Eli Zaretskii
@ 2020-04-24 12:09 ` Fab Rice
2020-04-25 8:49 ` Eli Zaretskii
2020-05-09 16:48 ` Stefan Kangas
0 siblings, 2 replies; 15+ messages in thread
From: Fab Rice @ 2020-04-24 12:09 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: 40759, stefan, Serghei, dgutov
[-- Attachment #1: Type: text/plain, Size: 730 bytes --]
Hello everybody,
Le 2020-04-24 13:26, Eli Zaretskii a écrit :
>> Date: Fri, 24 Apr 2020 10:57:35 +0000
>> From: Serghei <egrep@protonmail.ch>
>> Cc: 40759@debbugs.gnu.org, Eli Zaretskii <eliz@gnu.org>,
>> dgutov@yandex.ru
>>
>> I asked for this merge Leuven Theme in 22 March [1] so I'm more than
>> interested in merging this before 27.1 release.
>>
>> Eli, Stefan consider please to release Emacs 27.1 with fresh Leuven
>> version.
>
> What about the issues pointed out by Stefan in his message? Will an
> updated patch be posted any time soon?
Here's an updated patch file, where I've fixed the issues pointed by
Stefan.
PS- I don't know why, I do not get all the messages from this thread...
Best regards,
Fabrice
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Update-Leuven-theme.el.patch --]
[-- Type: text/x-diff; name=0001-Update-Leuven-theme.el.patch, Size: 70725 bytes --]
From 3e2f64c27630e4664f342155f78358f1cf80afec Mon Sep 17 00:00:00 2001
From: Fabrice Niessen <fniessen@pirilampo.org>
Date: Fri, 24 Apr 2020 14:05:55 +0200
Subject: [PATCH] Update Leuven-theme.el
---
etc/themes/leuven-theme.el | 704 +++++++++++++++++++++++++++----------
1 file changed, 527 insertions(+), 177 deletions(-)
diff --git etc/themes/leuven-theme.el etc/themes/leuven-theme.el
index 0d25ab9c5b..cdd09f555d 100644
--- etc/themes/leuven-theme.el
+++ etc/themes/leuven-theme.el
@@ -4,7 +4,7 @@
;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
;; URL: https://github.com/fniessen/emacs-leuven-theme
-;; Version: 20170912.2328
+;; Version: 20200424.1404
;; Keywords: color theme
;; This file is part of GNU Emacs.
@@ -31,58 +31,121 @@
;;
;; (load-theme 'leuven t)
;;
-;; Requirements: Emacs 24.
+;; Requirements: Emacs 24+.
+;;
+;; NOTE -- Would you like implement a version of this for dark backgrounds,
+;; please do so! I'm willing to integrate it...
;;; Code:
+;;; Options.
+
+(defgroup leuven nil
+ "Leuven theme options.
+The theme has to be reloaded after changing anything in this group."
+ :group 'faces)
+
+(defcustom leuven-scale-outline-headlines t
+ "Scale `outline' (and `org') level-1 headlines.
+This can be nil for unscaled, t for using the theme default, or a scaling
+number."
+ :type '(choice
+ (const :tag "Unscaled" nil)
+ (const :tag "Default provided by theme" t)
+ (number :tag "Set scaling"))
+ :group 'leuven)
+
+(defcustom leuven-scale-org-agenda-structure t
+ "Scale Org agenda structure lines, like dates.
+This can be nil for unscaled, t for using the theme default, or a scaling
+number."
+ :type '(choice
+ (const :tag "Unscaled" nil)
+ (const :tag "Default provided by theme" t)
+ (number :tag "Set scaling")))
+
+(defun leuven-scale-font (control default-height)
+ "Function for splicing optional font heights into face descriptions.
+CONTROL can be a number, nil, or t. When t, use DEFAULT-HEIGHT."
+ (cond
+ ((numberp control) (list :height control))
+ ((eq t control) (list :height default-height))
+ (t nil)))
+
+;;; Theme Faces.
+
(deftheme leuven
"Face colors with a light background.
-Basic, Font Lock, Isearch, Gnus, Message, Diff, Ediff, Flyspell,
-Semantic, and Ansi-Color faces are included -- and much more...")
+Basic, Font Lock, Isearch, Gnus, Message, Org mode, Diff, Ediff,
+Flyspell, Semantic, and Ansi-Color faces are included -- and much
+more...")
(let ((class '((class color) (min-colors 89)))
- ;; Leuven generic colors
- (cancel '(:slant italic :strike-through t :foreground "gray55"))
+ ;; Leuven generic colors.
+ (cancel '(:slant italic :strike-through t :foreground "#A9A9A9"))
(clock-line '(:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#EEC900"))
- (code-block '(:foreground "#000088" :background "#FFFFE0"))
- (code-inline '(:foreground "#006400" :background "#FDFFF7"))
+ (code-block '(:foreground "#000088" :background "#FFFFE0" :extend t))
+ (code-inline '(:foreground "#006400" :background "#FDFFF7" :extend t))
(column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#E6AD4F" :background "#FFF2DE"))
- (diff-added '(:foreground "#008000" :background "#DDFFDD"))
+ (completion-inline '(:weight normal :foreground "#C0C0C0" :inherit hl-line)) ; Like Google.
+ (completion-other-candidates '(:weight bold :foreground "black" :background "#EBF4FE"))
+ (completion-selected-candidate '(:weight bold :foreground "white" :background "#0052A4"))
+ (diff-added '(:background "#DDFFDD"))
(diff-changed '(:foreground "#0000FF" :background "#DDDDFF"))
- (diff-header '(:foreground "#800000" :background "#FFFFAF"))
+ (diff-header '(:weight bold :foreground "#800000" :background "#FFFFAF"))
(diff-hunk-header '(:foreground "#990099" :background "#FFEEFF"))
- (diff-none '(:foreground "gray33"))
- (diff-removed '(:foreground "#A60000" :background "#FFDDDD"))
+ (diff-none '(:foreground "#888888"))
+ (diff-refine-added '(:background "#97F295"))
+ (diff-refine-removed '(:background "#FFB6BA"))
+ (diff-removed '(:background "#FEE8E9"))
(directory '(:weight bold :foreground "blue" :background "#FFFFD2"))
- (highlight-line '(:background "#FFFFD7")) ; #F5F5F5
- (highlight-line-gnus '(:background "#DAEAFC")) ; defined in `gnus-leuven.el'
+ (file '(:foreground "black"))
+ (function-param '(:foreground "#247284"))
+ (grep-file-name '(:weight bold :foreground "#2A489E")) ; Used for grep hits.
+ (grep-line-number '(:weight bold :foreground "#A535AE"))
+ (highlight-blue '(:background "#E6ECFF" :extend t))
+ (highlight-blue2 '(:background "#E4F1F9" :extend t))
+ (highlight-gray '(:background "#E4E4E3" :extend t))
+ (highlight-green '(:background "#D5F1CF" :extend t))
+ (highlight-red '(:background "#FFC8C8" :extend t))
+ (highlight-yellow '(:background "#F6FECD" :extend t))
(link '(:weight normal :underline t :foreground "#006DAF"))
+ (link-no-underline '(:weight normal :foreground "#006DAF"))
(mail-header-name '(:family "Sans Serif" :weight normal :foreground "#A3A3A2"))
(mail-header-other '(:family "Sans Serif" :slant normal :foreground "#666666"))
- (mail-read '(:weight normal :foreground "#86878B"))
- (mail-ticked '(:weight bold :background "#FBE6EF"))
+ (mail-read '(:foreground "#8C8C8C"))
+ (mail-read-high '(:foreground "#808080"))
+ (mail-ticked '(:foreground "#FF3300"))
(mail-to '(:family "Sans Serif" :underline nil :foreground "#006DAF"))
- (mail-unread '(:weight bold :foreground "black"))
- (marked-line '(:weight bold :foreground "white" :background "red"))
- (match '(:weight bold :background "#FBE448")) ; occur patterns
- (ol1 '(:height 1.3 :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0"))
- (ol2 '(:height 1.0 :weight bold :overline "#123555" :foreground "#123555" :background "#E5F4FB"))
- (ol3 '(:height 1.0 :weight bold :foreground "#005522" :background "#EFFFEF"))
- (ol4 '(:height 1.0 :weight bold :slant normal :foreground "#EA6300"))
- (ol5 '(:height 1.0 :weight bold :slant normal :foreground "#E3258D"))
- (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC"))
- (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C"))
- (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"))
+ (mail-unread '(:weight bold :foreground "#000000"))
+ (mail-unread-high '(:weight bold :foreground "#135985"))
+ (marked-line '(:foreground "#AA0000" :background "#FFAAAA"))
+ (match '(:weight bold :background "#FFFF00")) ; occur patterns + match in helm for files + match in Org files.
+ (ol1 `(,@(leuven-scale-font leuven-scale-outline-headlines 1.3) :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0" :extend t))
+ (ol2 '(:height 1.0 :weight bold :overline "#123555" :foreground "#123555" :background "#E5F4FB" :extend t))
+ (ol3 '(:height 1.0 :weight bold :foreground "#005522" :background "#EFFFEF" :extend t))
+ (ol4 '(:height 1.0 :weight bold :slant normal :foreground "#EA6300" :extend t))
+ (ol5 '(:height 1.0 :weight bold :slant normal :foreground "#E3258D" :extend t))
+ (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC" :extend t))
+ (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C" :extend t))
+ (ol8 '(:height 1.0 :weight bold :slant italic :foreground "#FD8008" :extend t))
+ (paren-matched '(:background "#C0E8C3")) ; Or take that green for region?
+ (paren-unmatched '(:weight bold :underline "red" :foreground "black" :background "#FFA5A5"))
+ (region '(:background "#8ED3FF" :extend t))
(shadow '(:foreground "#7F7F7F"))
(string '(:foreground "#008000")) ; or #D0372D
(subject '(:family "Sans Serif" :weight bold :foreground "black"))
- (symlink '(:foreground "deep sky blue"))
- (volatile-highlight '(:underline nil :background "#FFF876"))
- (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA")))
+ (symlink '(:foreground "#1F8DD6"))
+ (tab '(:foreground "#E8E8E8" :background "white"))
+ (trailing '(:foreground "#E8E8E8" :background "#FFFFAB"))
+ (volatile-highlight '(:underline nil :foreground "white" :background "#9E3699"))
+ (volatile-highlight-supersize '(:height 1.1 :underline nil :foreground "white" :background "#9E3699")) ; flash-region
+ (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA"))
+ (xml-attribute '(:foreground "#F36335"))
+ (xml-tag '(:foreground "#AE1B9A"))
+ (highlight-current-tag '(:background "#E8E8FF")) ; #EEF3F6 or #FFEB26
+ )
(custom-theme-set-faces
'leuven
@@ -91,45 +154,49 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(bold-italic ((,class (:weight bold :slant italic :foreground "black"))))
`(italic ((,class (:slant italic :foreground "#1A1A1A"))))
`(underline ((,class (:underline t))))
- `(cursor ((,class (:background "#0FB300"))))
+ `(cursor ((,class (:background "#21BDFF"))))
- ;; Highlighting faces
- `(fringe ((,class (:foreground "#9B9B9B" :background "#EDEDED"))))
- `(highlight ((,class ,volatile-highlight)))
+ ;; Lucid toolkit emacs menus.
+ `(menu ((,class (:foreground "#FFFFFF" :background "#333333"))))
+
+ ;; Highlighting faces.
+ `(fringe ((,class (:foreground "#4C9ED9" :background "white"))))
+ `(highlight ((,class ,highlight-blue)))
`(region ((,class ,region)))
- `(secondary-selection ((,class ,match))) ; used by Org-mode for highlighting matched entries and keywords
- `(isearch ((,class (:weight bold :underline "#FF9632" :foreground nil :background "#FDBD33"))))
- `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FF9999"))))
- `(lazy-highlight ((,class (:underline "#FF9632" :background "#FFFF00")))) ; isearch others
- `(trailing-whitespace ((,class (:background "#FFFF57"))))
- `(whitespace-hspace ((,class (:foreground "#D2D2D2"))))
- `(whitespace-indentation ((,class (:foreground "#A1A1A1" :background "white"))))
+ `(secondary-selection ((,class ,match))) ; Used by Org-mode for highlighting matched entries and keywords.
+ `(isearch ((,class (:underline "black" :foreground "white" :background "#5974AB"))))
+ `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FFCCCC"))))
+ `(lazy-highlight ((,class (:foreground "black" :background "#FFFF00")))) ; Isearch others (see `match').
+ `(trailing-whitespace ((,class ,trailing)))
+ `(query-replace ((,class (:inherit isearch))))
+ `(whitespace-hspace ((,class (:foreground "#D2D2D2")))) ; see also `nobreak-space'
+ `(whitespace-indentation ((,class ,tab)))
`(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88"))))
- `(whitespace-tab ((,class (:foreground "#A1A1A1" :background "white"))))
- `(whitespace-trailing ((,class (:foreground "#B3B3B3" :background "#FFFF57"))))
+ `(whitespace-tab ((,class ,tab)))
+ `(whitespace-trailing ((,class ,trailing)))
- ;; Mode line faces
+ ;; Mode line faces.
`(mode-line ((,class (:box (:line-width 1 :color "#1A2F54") :foreground "#85CEEB" :background "#335EA8"))))
`(mode-line-inactive ((,class (:box (:line-width 1 :color "#4E4E4C") :foreground "#F0F0EF" :background "#9B9C97"))))
`(mode-line-buffer-id ((,class (:weight bold :foreground "white"))))
`(mode-line-emphasis ((,class (:weight bold :foreground "white"))))
`(mode-line-highlight ((,class (:foreground "yellow"))))
- ;; Escape and prompt faces
+ ;; Escape and prompt faces.
`(minibuffer-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(minibuffer-noticeable-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(escape-glyph ((,class (:foreground "#008ED1"))))
- `(homoglyph ((,class (:foreground "#008ED1"))))
`(error ((,class (:foreground "red"))))
`(warning ((,class (:weight bold :foreground "orange"))))
`(success ((,class (:foreground "green"))))
- ;; Font lock faces
+ ;; Font lock faces.
`(font-lock-builtin-face ((,class (:foreground "#006FE0"))))
`(font-lock-comment-delimiter-face ((,class (:foreground "#8D8D84")))) ; #696969
`(font-lock-comment-face ((,class (:slant italic :foreground "#8D8D84")))) ; #696969
`(font-lock-constant-face ((,class (:foreground "#D0372D"))))
`(font-lock-doc-face ((,class (:foreground "#036A07"))))
+ ;; `(font-lock-doc-string-face ((,class (:foreground "#008000")))) ; XEmacs only, but is used for HTML exports from org2html (and not interactively)
`(font-lock-function-name-face ((,class (:weight normal :foreground "#006699"))))
`(font-lock-keyword-face ((,class (:bold nil :foreground "#0000FF")))) ; #3654DC
`(font-lock-preprocessor-face ((,class (:foreground "#808080"))))
@@ -140,32 +207,32 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(font-lock-variable-name-face ((,class (:weight normal :foreground "#BA36A5")))) ; #800080
`(font-lock-warning-face ((,class (:weight bold :foreground "red"))))
- ;; Button and link faces
+ ;; Button and link faces.
`(link ((,class ,link)))
`(link-visited ((,class (:underline t :foreground "#E5786D"))))
`(button ((,class (:underline t :foreground "#006DAF"))))
- `(header-line ((,class (:weight bold :underline "black" :overline "black" :foreground "black" :background "#FFFF88"))))
+ `(header-line ((,class (:box (:line-width 1 :color "black") :foreground "black" :background "#F0F0F0"))))
- ;; Gnus faces
+ ;; Gnus faces.
`(gnus-button ((,class (:weight normal))))
`(gnus-cite-attribution-face ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-1 ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-10 ((,class (:foreground "#990000"))))
- `(gnus-cite-face-2 ((,class (:foreground "#660066"))))
- `(gnus-cite-face-3 ((,class (:foreground "#007777"))))
- `(gnus-cite-face-4 ((,class (:foreground "#990000"))))
- `(gnus-cite-face-5 ((,class (:foreground "#000099"))))
- `(gnus-cite-face-6 ((,class (:foreground "#BB6600"))))
- `(gnus-cite-face-7 ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-8 ((,class (:foreground "#660066"))))
- `(gnus-cite-face-9 ((,class (:foreground "#007777"))))
+ `(gnus-cite-1 ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
+ `(gnus-cite-2 ((,class (:foreground "#660066" :background "#F6F6F6"))))
+ `(gnus-cite-3 ((,class (:foreground "#007777" :background "#F6F6F6"))))
+ `(gnus-cite-4 ((,class (:foreground "#990000" :background "#F6F6F6"))))
+ `(gnus-cite-5 ((,class (:foreground "#000099" :background "#F6F6F6"))))
+ `(gnus-cite-6 ((,class (:foreground "#BB6600" :background "#F6F6F6"))))
+ `(gnus-cite-7 ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
+ `(gnus-cite-8 ((,class (:foreground "#660066" :background "#F6F6F6"))))
+ `(gnus-cite-9 ((,class (:foreground "#007777" :background "#F6F6F6"))))
+ `(gnus-cite-10 ((,class (:foreground "#990000" :background "#F6F6F6"))))
`(gnus-emphasis-bold ((,class (:weight bold))))
`(gnus-emphasis-highlight-words ((,class (:foreground "yellow" :background "black"))))
`(gnus-group-mail-1 ((,class (:weight bold :foreground "#FF50B0"))))
`(gnus-group-mail-1-empty ((,class (:foreground "#5050B0"))))
`(gnus-group-mail-2 ((,class (:weight bold :foreground "#FF0066"))))
`(gnus-group-mail-2-empty ((,class (:foreground "#660066"))))
- `(gnus-group-mail-3 ((,class (:weight bold :foreground "black"))))
+ `(gnus-group-mail-3 ((,class ,mail-unread)))
`(gnus-group-mail-3-empty ((,class ,mail-read)))
`(gnus-group-mail-low ((,class ,cancel)))
`(gnus-group-mail-low-empty ((,class ,cancel)))
@@ -173,8 +240,8 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-group-news-1-empty ((,class (:foreground "#5050B0"))))
`(gnus-group-news-2 ((,class (:weight bold :foreground "#FF0066"))))
`(gnus-group-news-2-empty ((,class (:foreground "#660066"))))
- `(gnus-group-news-3 ((,class (:weight bold :foreground "black"))))
- `(gnus-group-news-3-empty ((,class (:foreground "#808080"))))
+ `(gnus-group-news-3 ((,class ,mail-unread)))
+ `(gnus-group-news-3-empty ((,class ,mail-read)))
`(gnus-group-news-4 ((,class (:weight bold :foreground "#FF0000"))))
`(gnus-group-news-4-empty ((,class (:foreground "#990000"))))
`(gnus-group-news-5 ((,class (:weight bold :foreground "#FF0099"))))
@@ -194,11 +261,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-signature ((,class (:slant italic :foreground "#8B8D8E"))))
`(gnus-splash ((,class (:foreground "#FF8C00"))))
`(gnus-summary-cancelled ((,class ,cancel)))
- `(gnus-summary-high-ancient ((,class (:weight normal :foreground "#808080" :background "#FFFFE6"))))
- `(gnus-summary-high-read ((,class (:weight normal :foreground "#999999" :background "#FFFFE6"))))
+ `(gnus-summary-high-ancient ((,class ,mail-unread-high)))
+ `(gnus-summary-high-read ((,class ,mail-read-high)))
`(gnus-summary-high-ticked ((,class ,mail-ticked)))
- `(gnus-summary-high-unread ((,class (:weight bold :foreground "black" :background "#FFFFCC"))))
- `(gnus-summary-low-ancient ((,class (:slant italic :foreground "gray55"))))
+ `(gnus-summary-high-unread ((,class ,mail-unread-high)))
+ `(gnus-summary-low-ancient ((,class (:slant italic :foreground "black"))))
`(gnus-summary-low-read ((,class (:slant italic :foreground "#999999" :background "#E0E0E0"))))
`(gnus-summary-low-ticked ((,class ,mail-ticked)))
`(gnus-summary-low-unread ((,class (:slant italic :foreground "black"))))
@@ -209,82 +276,105 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-summary-selected ((,class (:foreground "white" :background "#008CD7"))))
`(gnus-x-face ((,class (:foreground "black" :background "white"))))
- ;; Message faces
+ ;; Message faces.
`(message-header-name ((,class ,mail-header-name)))
`(message-header-cc ((,class ,mail-to)))
`(message-header-other ((,class ,mail-header-other)))
`(message-header-subject ((,class ,subject)))
`(message-header-to ((,class ,mail-to)))
- `(message-cited-text ((,class (:foreground "#5050B0"))))
+ `(message-cited-text ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
`(message-separator ((,class (:family "Sans Serif" :weight normal :foreground "#BDC2C6"))))
`(message-header-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC"))))
`(message-header-xheader ((,class ,mail-header-other)))
`(message-mml ((,class (:foreground "forest green"))))
- ;; Diff
+ ;; Diff.
`(diff-added ((,class ,diff-added)))
`(diff-changed ((,class ,diff-changed)))
`(diff-context ((,class ,diff-none)))
`(diff-file-header ((,class ,diff-header)))
`(diff-file1-hunk-header ((,class (:foreground "dark magenta" :background "#EAF2F5"))))
`(diff-file2-hunk-header ((,class (:foreground "#2B7E2A" :background "#EAF2F5"))))
- `(diff-function ((,class (:foreground "darkgray"))))
+ `(diff-function ((,class (:foreground "#CC99CC"))))
`(diff-header ((,class ,diff-header)))
`(diff-hunk-header ((,class ,diff-hunk-header)))
`(diff-index ((,class ,diff-header)))
- `(diff-indicator-added ((,class (:background "#AAFFAA"))))
- `(diff-indicator-changed ((,class (:background "#8080FF"))))
- `(diff-indicator-removed ((,class (:background "#FFBBBB"))))
+ `(diff-indicator-added ((,class (:foreground "#3A993A" :background "#CDFFD8"))))
+ `(diff-indicator-changed ((,class (:background "#DBEDFF"))))
+ `(diff-indicator-removed ((,class (:foreground "#CC3333" :background "#FFDCE0"))))
+ `(diff-refine-added ((,class ,diff-refine-added)))
`(diff-refine-change ((,class (:background "#DDDDFF"))))
+ `(diff-refine-removed ((,class ,diff-refine-removed)))
`(diff-removed ((,class ,diff-removed)))
- ;; SMerge
+ ;; SMerge.
+ `(smerge-mine ((,class ,diff-changed)))
+ `(smerge-other ((,class ,diff-added)))
+ `(smerge-base ((,class ,diff-removed)))
+ `(smerge-markers ((,class (:background "#FFE5CC"))))
`(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-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.
+ `(ediff-current-diff-A ((,class (:background "#FFDDDD" :extend t))))
+ `(ediff-current-diff-B ((,class (:background "#DDFFDD" :extend t))))
+ `(ediff-current-diff-C ((,class (:background "cyan" :extend t))))
+ `(ediff-even-diff-A ((,class (:background "light grey" :extend t))))
+ `(ediff-even-diff-B ((,class (:background "light grey" :extend t))))
+ `(ediff-fine-diff-A ((,class (:background "#FFAAAA" :extend t))))
+ `(ediff-fine-diff-B ((,class (:background "#55FF55" :extend t))))
+ `(ediff-odd-diff-A ((,class (:background "light grey" :extend t))))
+ `(ediff-odd-diff-B ((,class (:background "light grey" :extend t))))
- ;; Flyspell
-;; (when (version< emacs-version "24.XXX")
- `(flyspell-duplicate ((,class (:underline "#008000" :inherit nil))))
- `(flyspell-incorrect ((,class (:underline "red" :inherit nil))))
-;; `(flyspell-duplicate ((,class (:underline (:style wave :color "#008000") :inherit nil))))
-;; `(flyspell-incorrect ((,class (:underline (:style wave :color "red") :inherit nil))))
+ ;; Flyspell.
+ (if (version< emacs-version "24.4")
+ `(flyspell-duplicate ((,class (:underline "#F4EB80" :inherit nil))))
+ `(flyspell-duplicate ((,class (:underline (:style wave :color "#F4EB80") :background "#FAF7CC" :inherit nil)))))
+ (if (version< emacs-version "24.4")
+ `(flyspell-incorrect ((,class (:underline "#FAA7A5" :inherit nil))))
+ `(flyspell-incorrect ((,class (:underline (:style wave :color "#FAA7A5") :background "#F4D7DA":inherit nil)))))
- ;; ;; Semantic faces
+ ;; ;; Semantic faces.
;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4))))
;; `(semantic-decoration-on-private-members-face ((,class (:background ,alum-2))))
;; `(semantic-decoration-on-protected-members-face ((,class (:background ,alum-2))))
- ;; `(semantic-decoration-on-unknown-includes ((,class (:background ,choc-3))))
+ `(semantic-decoration-on-unknown-includes ((,class (:background "#FFF8F8"))))
;; `(semantic-decoration-on-unparsed-includes ((,class (:underline ,orange-3))))
- ;; `(semantic-tag-boundary-face ((,class (:overline ,blue-1))))
+ `(semantic-highlight-func-current-tag-face ((,class ,highlight-current-tag)))
+ `(semantic-tag-boundary-face ((,class (:overline "#777777")))) ; Method separator.
;; `(semantic-unmatched-syntax-face ((,class (:underline ,red-1))))
`(Info-title-1-face ((,class ,ol1)))
`(Info-title-2-face ((,class ,ol2)))
`(Info-title-3-face ((,class ,ol3)))
`(Info-title-4-face ((,class ,ol4)))
- `(ac-completion-face ((,class (:underline nil :foreground "#C0C0C0")))) ; like Google
- `(ace-jump-face-foreground ((,class (:foreground "black" :background "#FBE448"))))
+ `(ace-jump-face-foreground ((,class (:weight bold :foreground "black" :background "#FEA500"))))
+ `(ahs-face ((,class (:background "#E4E4FF"))))
+ `(ahs-definition-face ((,class (:background "#FFB6C6"))))
+ `(ahs-plugin-defalt-face ((,class (:background "#FFE4FF")))) ; Current.
+ `(anzu-match-1 ((,class (:foreground "black" :background "aquamarine"))))
+ `(anzu-match-2 ((,class (:foreground "black" :background "springgreen"))))
+ `(anzu-match-3 ((,class (:foreground "black" :background "red"))))
+ `(anzu-mode-line ((,class (:foreground "black" :background "#80FF80"))))
+ `(anzu-mode-line-no-match ((,class (:foreground "black" :background "#FF8080"))))
+ `(anzu-replace-highlight ((,class (:inherit query-replace))))
+ `(anzu-replace-to ((,class (:weight bold :foreground "#BD33FD" :background "#FDBD33"))))
`(auto-dim-other-buffers-face ((,class (:background "#F7F7F7"))))
+ `(avy-background-face ((,class (:background "#A9A9A9"))))
+ `(avy-lead-face ((,class (:weight bold :foreground "black" :background "#FEA500"))))
`(bbdb-company ((,class (:slant italic :foreground "steel blue"))))
`(bbdb-field-name ((,class (:weight bold :foreground "steel blue"))))
`(bbdb-field-value ((,class (:foreground "steel blue"))))
`(bbdb-name ((,class (:underline t :foreground "#FF6633"))))
- `(bmkp-light-autonamed ((,class (:background "#C2DDFD"))))
- `(bmkp-light-fringe-autonamed ((,class (:background "#90AFD5"))))
- `(bmkp-light-fringe-non-autonamed ((,class (:background "#D5FFD5"))))
- `(bmkp-light-non-autonamed ((,class (:background "#C4FFC4"))))
- `(browse-kill-ring-separator-face ((,class (:weight bold :foreground "slate gray"))))
+ `(bmkp-light-autonamed ((,class (:background "#F0F0F0"))))
+ `(bmkp-light-fringe-autonamed ((,class (:foreground "#5A5A5A" :background "#D4D4D4"))))
+ `(bmkp-light-fringe-non-autonamed ((,class (:foreground "#FFFFCC" :background "#01FFFB")))) ; default
+ `(bmkp-light-non-autonamed ((,class (:background "#BFFFFE"))))
+ `(bmkp-no-local ((,class (:background "pink"))))
+ `(browse-kill-ring-separator-face ((,class (:foreground "red"))))
+ `(calendar-month-header ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
`(calendar-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(calendar-weekday-header ((,class (:weight bold :foreground "#1662AF"))))
+ `(calendar-weekend-header ((,class (:weight bold :foreground "#4E4E4E"))))
`(cfw:face-annotation ((,class (:foreground "green" :background "red"))))
`(cfw:face-day-title ((,class (:foreground "#C9C9C9"))))
`(cfw:face-default-content ((,class (:foreground "#2952A3"))))
@@ -299,12 +389,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(cfw:face-sunday ((,class (:foreground "#4E4E4E" :background "white" :weight bold))))
`(cfw:face-title ((,class (:height 2.0 :foreground "#676767" :weight bold :inherit variable-pitch))))
`(cfw:face-today ((,class (:foreground "#4F4A3D" :background "#FFFFCC"))))
- `(cfw:face-today-title ((,class (:foreground "#4A95EB" :background "#FFFFCC"))))
+ `(cfw:face-today-title ((,class (:foreground "white" :background "#1766B1"))))
`(cfw:face-toolbar ((,class (:background "white"))))
`(cfw:face-toolbar-button-off ((,class (:foreground "#CFCFCF" :background "white"))))
`(cfw:face-toolbar-button-on ((,class (:foreground "#5E5E5E" :background "#F6F6F6"))))
- `(change-log-date-face ((,class (:foreground "purple"))))
+ `(change-log-date ((,class (:foreground "purple"))))
`(change-log-file ((,class (:weight bold :foreground "#4183C4"))))
+ `(change-log-list ((,class (:foreground "black" :background "#75EEC7"))))
+ `(change-log-name ((,class (:foreground "#008000"))))
`(circe-highlight-all-nicks-face ((,class (:foreground "blue" :background "#F0F0F0")))) ; other nick names
`(circe-highlight-nick-face ((,class (:foreground "#009300" :background "#F0F0F0")))) ; messages with my nick cited
`(circe-my-message-face ((,class (:foreground "#8B8B8B" :background "#F0F0F0"))))
@@ -314,15 +406,38 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(comint-highlight-input ((,class (:weight bold :foreground "#0000FF" :inherit nil))))
;; `(comint-highlight-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(comint-highlight-prompt ((,class (:weight bold :foreground "#0000FF" :inherit nil))))
- `(company-preview-common ((,class (:foreground "#C0C0C0" :background "#FFFFD7")))) ; same background as highlight-line
- `(company-tooltip-annotation ((,class (:foreground "#999999" :background "cornsilk"))))
- `(company-tooltip-common ((,class (:weight bold :inherit company-tooltip))))
- `(company-tooltip-common-selection ((,class (:weight bold :inherit company-tooltip-selection))))
+
+ ;; `(ac-selection-face ((,class ,completion-selected-candidate)))
+ `(ac-selection-face ((,class (:weight bold :foreground "white" :background "orange")))) ; TEMP For diff'ing AC from Comp.
+ `(ac-candidate-face ((,class ,completion-other-candidates)))
+ `(ac-completion-face ((,class ,completion-inline)))
+ `(ac-candidate-mouse-face ((,class (:inherit highlight))))
+ `(popup-scroll-bar-background-face ((,class (:background "#EBF4FE"))))
+ `(popup-scroll-bar-foreground-face ((,class (:background "#D1DAE4")))) ; Scrollbar (visible).
+
+ `(company-tooltip-common-selection ((,class (:weight normal :foreground "#F9ECCC" :inherit company-tooltip-selection)))) ; Prefix + common part in tooltip (for selection).
+ `(company-tooltip-selection ((,class ,completion-selected-candidate))) ; Suffix in tooltip (for selection).
+ `(company-tooltip-annotation-selection ((,class (:weight normal :foreground "#F9ECCC")))) ; Annotation (for selection).
+
+ `(company-tooltip-common ((,class (:weight normal :foreground "#B000B0" :inherit company-tooltip)))) ; Prefix + common part in tooltip.
+ `(company-tooltip ((,class ,completion-other-candidates))) ; Suffix in tooltip.
+ `(company-tooltip-annotation ((,class (:weight normal :foreground "#2415FF")))) ; Annotation.
+
+ `(company-preview-common ((,class ,completion-inline)))
+
+ `(company-scrollbar-bg ((,class (:background "#EBF4FE"))))
+ `(company-scrollbar-fg ((,class (:background "#D1DAE4")))) ; Scrollbar (visible).
+
`(compare-windows ((,class (:background "#FFFF00"))))
- `(compilation-error ((,class (:weight bold :foreground "red"))))
- `(compilation-info ((,class (:weight bold :foreground "#2A489E")))) ; used for grep
- `(compilation-line-number ((,class (:weight bold :foreground "#A535AE"))))
+ ;; `(completions-common-part ((,class (:foreground "red" :weight bold))))
+ ;; `(completions-first-difference ((,class (:foreground "green" :weight bold))))
+ `(compilation-error ((,class (:weight bold :foreground "red")))) ; Used for grep error messages.
+ `(compilation-info ((,class ,grep-file-name)))
+ `(compilation-line-number ((,class ,grep-line-number)))
`(compilation-warning ((,class (:weight bold :foreground "orange"))))
+ `(compilation-mode-line-exit ((,class (:weight bold :foreground "green")))) ; :exit[matched]
+ `(compilation-mode-line-fail ((,class (:weight bold :foreground "violet")))) ; :exit[no match]
+ `(compilation-mode-line-run ((,class (:weight bold :foreground "orange")))) ; :run
`(css-property ((,class (:foreground "#00AA00"))))
`(css-selector ((,class (:weight bold :foreground "blue"))))
`(custom-button ((,class (:box (:line-width 2 :style released-button) :foreground "black" :background "lightgrey"))))
@@ -348,11 +463,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(custom-variable-button ((,class (:weight bold :underline t))))
`(custom-variable-tag ((,class (:family "Sans Serif" :height 1.2 :weight bold :foreground "blue1"))))
`(custom-visibility ((,class ,link)))
- `(diff-hl-change ((,class (:foreground "blue3" :inherit diff-changed))))
- `(diff-hl-delete ((,class (:foreground "red3" :inherit diff-removed))))
- `(diff-hl-dired-change ((,class (:background "#FFA335" :foreground "black" :weight bold))))
+ `(diff-hl-change ((,class (:foreground "blue3" :background "#DBEDFF"))))
+ `(diff-hl-delete ((,class (:foreground "red3" :background "#FFDCE0"))))
+ `(diff-hl-dired-change ((,class (:weight bold :foreground "black" :background "#FFA335"))))
+ `(diff-hl-dired-delete ((,class (:weight bold :foreground "#D73915"))))
+ `(diff-hl-dired-ignored ((,class (:weight bold :foreground "white" :background "#C0BBAB"))))
+ `(diff-hl-dired-insert ((,class (:weight bold :foreground "#B9B9BA"))))
`(diff-hl-dired-unknown ((,class (:foreground "white" :background "#3F3BB4"))))
- `(diff-hl-insert ((,class (:foreground "green4" :inherit diff-added))))
+ `(diff-hl-insert ((,class (:foreground "green4" :background "#CDFFD8"))))
`(diff-hl-unknown ((,class (:foreground "white" :background "#3F3BB4"))))
`(diary-face ((,class (:foreground "#87C9FC"))))
`(dircolors-face-asm ((,class (:foreground "black"))))
@@ -385,17 +503,36 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(diredp-compressed-file-suffix ((,class (:foreground "red"))))
`(diredp-date-time ((,class (:foreground "purple"))))
`(diredp-dir-heading ((,class ,directory)))
+ `(diredp-dir-name ((,class ,directory)))
`(diredp-dir-priv ((,class ,directory)))
`(diredp-exec-priv ((,class (:background "#03C03C"))))
`(diredp-executable-tag ((,class (:foreground "ForestGreen" :background "white"))))
- `(diredp-file-name ((,class (:foreground "black"))))
+ `(diredp-file-name ((,class ,file)))
`(diredp-file-suffix ((,class (:foreground "#C0C0C0"))))
`(diredp-flag-mark-line ((,class ,marked-line)))
`(diredp-ignored-file-name ((,class ,shadow)))
`(diredp-read-priv ((,class (:background "#0A99FF"))))
`(diredp-write-priv ((,class (:foreground "white" :background "#FF4040"))))
+ `(eldoc-highlight-function-argument ((,class (:weight bold :foreground "red" :background "#FFE4FF"))))
+ `(elfeed-search-filter-face ((,class (:foreground "gray"))))
+ ;; `(eww-form-checkbox ((,class ())))
+ ;; `(eww-form-select ((,class ())))
+ ;; `(eww-form-submit ((,class ())))
+ `(eww-form-text ((,class (:weight bold :foreground "#40586F" :background "#A7CDF1"))))
+ ;; `(eww-form-textarea ((,class ())))
`(file-name-shadow ((,class ,shadow)))
+ `(flycheck-error ((,class (:underline (:color "#FE251E" :style wave) :weight bold :background "#FFE1E1"))))
+ `(flycheck-error-list-line-number ((,class (:foreground "#A535AE"))))
+ `(flycheck-fringe-error ((,class (:foreground "#FE251E"))))
+ `(flycheck-fringe-info ((,class (:foreground "#158A15"))))
+ `(flycheck-fringe-warning ((,class (:foreground "#F4A939"))))
+ `(flycheck-info ((,class (:underline (:color "#158A15" :style wave) :weight bold))))
+ `(flycheck-warning ((,class (:underline (:color "#F4A939" :style wave) :weight bold :background "#FFFFBE"))))
`(font-latex-bold-face ((,class (:weight bold :foreground "black"))))
+ `(fancy-narrow-blocked-face ((,class (:foreground "#9998A4"))))
+ `(flycheck-color-mode-line-error-face ((, class (:background "#CF5B56"))))
+ `(flycheck-color-mode-line-warning-face ((, class (:background "#EBC700"))))
+ `(flycheck-color-mode-line-info-face ((, class (:background "yellow"))))
`(font-latex-italic-face ((,class (:slant italic :foreground "#1A1A1A"))))
`(font-latex-math-face ((,class (:foreground "blue"))))
`(font-latex-sectioning-1-face ((,class (:family "Sans Serif" :height 2.7 :weight bold :foreground "cornflower blue"))))
@@ -408,36 +545,65 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(font-latex-verbatim-face ((,class (:foreground "#000088" :background "#FFFFE0" :inherit nil))))
`(git-commit-summary-face ((,class (:foreground "#000000"))))
`(git-commit-comment-face ((,class (:slant italic :foreground "#696969"))))
+ `(git-timemachine-commit ((,class ,diff-removed)))
+ `(git-timemachine-minibuffer-author-face ((,class ,diff-added)))
+ `(git-timemachine-minibuffer-detail-face ((,class ,diff-header)))
+ `(google-translate-text-face ((,class (:foreground "#777777" :background "#F5F5F5"))))
+ `(google-translate-phonetic-face ((,class (:inherit shadow))))
+ `(google-translate-translation-face ((,class (:weight normal :foreground "#3079ED" :background "#E3EAF2"))))
+ `(google-translate-suggestion-label-face ((,class (:foreground "red"))))
+ `(google-translate-suggestion-face ((,class (:slant italic :underline t))))
+ `(google-translate-listen-button-face ((,class (:height 0.8))))
`(helm-action ((,class (:foreground "black"))))
+ `(helm-bookmark-file ((,class ,file)))
`(helm-bookmarks-su-face ((,class (:foreground "red"))))
+ `(helm-buffer-directory ((,class ,directory)))
+ ;; `(helm-non-file-buffer ((,class (:slant italic :foreground "blue"))))
+ ;; `(helm-buffer-file ((,class (:foreground "#333333"))))
+ `(helm-buffer-modified ((,class (:slant italic :foreground "#BA36A5"))))
`(helm-buffer-process ((,class (:foreground "#008200"))))
`(helm-candidate-number ((,class (:foreground "black" :background "#FFFF66"))))
`(helm-dir-heading ((,class (:foreground "blue" :background "pink"))))
`(helm-dir-priv ((,class (:foreground "dark red" :background "light grey"))))
`(helm-ff-directory ((,class ,directory)))
+ `(helm-ff-dotted-directory ((,class ,directory)))
`(helm-ff-executable ((,class (:foreground "green3" :background "white"))))
`(helm-ff-file ((,class (:foreground "black"))))
`(helm-ff-invalid-symlink ((,class (:foreground "yellow" :background "red"))))
`(helm-ff-symlink ((,class ,symlink)))
`(helm-file-name ((,class (:foreground "blue"))))
`(helm-gentoo-match-face ((,class (:foreground "red"))))
+ `(helm-grep-file ((,class ,grep-file-name)))
+ `(helm-grep-lineno ((,class ,grep-line-number)))
`(helm-grep-match ((,class ,match)))
`(helm-grep-running ((,class (:weight bold :foreground "white"))))
- `(helm-grep-lineno ((,class ,shadow)))
`(helm-isearch-match ((,class (:background "#CCFFCC"))))
+ `(helm-lisp-show-completion ((,class ,volatile-highlight-supersize))) ; See `helm-dabbrev'.
+ ;; `(helm-ls-git-added-copied-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-added-modified-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-conflict-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-deleted-and-staged-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-deleted-not-staged-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-modified-and-staged-face ((,class (:foreground ""))))
+ `(helm-ls-git-modified-not-staged-face ((,class (:foreground "#BA36A5"))))
+ ;; `(helm-ls-git-renamed-modified-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-untracked-face ((,class (:foreground ""))))
`(helm-match ((,class ,match)))
`(helm-moccur-buffer ((,class (:foreground "#0066CC"))))
- `(helm-selection ((,class ,volatile-highlight)))
- `(helm-selection-line ((,class ,volatile-highlight)))
- `(helm-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#2F69BF"))))
- `(helm-swoop-target-line-face ((,class ,volatile-highlight)))
+ `(helm-selection ((,class (:background "#3875D6" :foreground "white"))))
+ `(helm-selection-line ((,class ,highlight-gray))) ; ???
+ `(helm-separator ((,class (:foreground "red"))))
+ `(helm-source-header ((,class (:weight bold :box (:line-width 1 :color "#C7C7C7") :background "#DEDEDE" :foreground "black"))))
`(helm-swoop-target-line-block-face ((,class (:background "#CCCC00" :foreground "#222222"))))
+ `(helm-swoop-target-line-face ((,class (:background "#CCCCFF"))))
`(helm-swoop-target-word-face ((,class (:weight bold :foreground nil :background "#FDBD33"))))
`(helm-visible-mark ((,class ,marked-line)))
`(helm-w3m-bookmarks-face ((,class (:underline t :foreground "cyan1"))))
+ `(highlight-changes ((,class (:foreground nil)))) ;; blue "#2E08B5"
+ `(highlight-changes-delete ((,class (:strike-through nil :foreground nil)))) ;; red "#B5082E"
`(highlight-symbol-face ((,class (:background "#FFFFA0"))))
- `(hl-line ((,class ,highlight-line)))
- `(hl-tags-face ((,class (:background "#FEFCAE"))))
+ `(hl-line ((,class ,highlight-yellow))) ; Highlight current line.
+ `(hl-tags-face ((,class ,highlight-current-tag))) ; ~ Pair highlighting (matching tags).
`(holiday-face ((,class (:foreground "#777777" :background "#E4EBFE"))))
`(html-helper-bold-face ((,class (:weight bold :foreground "black"))))
`(html-helper-italic-face ((,class (:slant italic :foreground "black"))))
@@ -448,9 +614,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(ilog-echo-face ((,class (:height 2.0 :foreground "#006FE0"))))
`(ilog-load-face ((,class (:foreground "#BA36A5"))))
`(ilog-message-face ((,class (:foreground "#808080"))))
+ `(indent-guide-face ((,class (:foreground "#D3D3D3"))))
`(info-file ((,class (:family "Sans Serif" :height 1.8 :weight bold :box (:line-width 1 :color "#0000CC") :foreground "cornflower blue" :background "LightSteelBlue1"))))
`(info-header-node ((,class (:underline t :foreground "orange")))) ; nodes in header
`(info-header-xref ((,class (:underline t :foreground "dodger blue")))) ; cross references in header
+ `(info-index-match ((,class (:weight bold :foreground nil :background "#FDBD33")))) ; when using `i'
`(info-menu-header ((,class ,ol2))) ; menu titles (headers) -- major topics
`(info-menu-star ((,class (:foreground "black")))) ; every 3rd menu item
`(info-node ((,class (:underline t :foreground "blue")))) ; node names
@@ -459,16 +627,48 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(info-title-1 ((,class ,ol1)))
`(info-xref ((,class (:underline t :foreground "#006DAF")))) ; unvisited cross-references
`(info-xref-visited ((,class (:underline t :foreground "magenta4")))) ; previously visited cross-references
+ ;; js2-highlight-vars-face (~ auto-highlight-symbol)
+ `(js2-error ((,class (:box (:line-width 1 :color "#FF3737") :background "#FFC8C8")))) ; DONE.
+ `(js2-external-variable ((,class (:foreground "#FF0000" :background "#FFF8F8")))) ; DONE.
+ `(js2-function-param ((,class ,function-param)))
+ `(js2-instance-member ((,class (:foreground "DarkOrchid"))))
+ `(js2-jsdoc-html-tag-delimiter ((,class (:foreground "#D0372D"))))
+ `(js2-jsdoc-html-tag-name ((,class (:foreground "#D0372D"))))
+ `(js2-jsdoc-tag ((,class (:weight normal :foreground "#6434A3"))))
+ `(js2-jsdoc-type ((,class (:foreground "SteelBlue"))))
+ `(js2-jsdoc-value ((,class (:weight normal :foreground "#BA36A5")))) ; #800080
+ `(js2-magic-paren ((,class (:underline t))))
+ `(js2-private-function-call ((,class (:foreground "goldenrod"))))
+ `(js2-private-member ((,class (:foreground "PeachPuff3"))))
+ `(js2-warning ((,class (:underline "orange"))))
+
+ ;; Org non-standard faces.
+ `(leuven-org-deadline-overdue ((,class (:foreground "#F22659"))))
+ `(leuven-org-deadline-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(leuven-org-deadline-tomorrow ((,class (:foreground "#40A80B"))))
+ `(leuven-org-deadline-future ((,class (:foreground "#40A80B"))))
+ `(leuven-gnus-unseen ((,class (:weight bold :foreground "#FC7202"))))
+ `(leuven-gnus-date ((,class (:foreground "#FF80BF"))))
+ `(leuven-gnus-size ((,class (:foreground "#8FBF60"))))
+ `(leuven-todo-items-face ((,class (:weight bold :foreground "#FF3125" :background "#FFFF88"))))
+
`(light-symbol-face ((,class (:background "#FFFFA0"))))
- `(linum ((,class (:inherit (default shadow) :foreground "#9A9A9A" :background "#EDEDED"))))
+ `(linum ((,class (:foreground "#9A9A9A" :background "#EDEDED"))))
`(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
+ `(log-view-message ((,class (:foreground "black" :background "#EDEA74"))))
`(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"))))
+ `(magit-blame-header ((,class (:inherit magit-diff-file-header))))
+ `(magit-blame-heading ((,class (:overline "#A7A7A7" :foreground "red" :background "#E6E6E6"))))
+ `(magit-blame-hash ((,class (:overline "#A7A7A7" :foreground "red" :background "#E6E6E6"))))
+ `(magit-blame-name ((,class (:overline "#A7A7A7" :foreground "#036A07" :background "#E6E6E6"))))
+ `(magit-blame-date ((,class (:overline "#A7A7A7" :foreground "blue" :background "#E6E6E6"))))
+ `(magit-blame-summary ((,class (:overline "#A7A7A7" :weight bold :foreground "#707070" :background "#E6E6E6"))))
`(magit-branch ((,class ,vc-branch)))
`(magit-diff-add ((,class ,diff-added)))
`(magit-diff-del ((,class ,diff-removed)))
- `(magit-diff-file-header ((,class (:family "Sans Serif" :height 1.1 :weight bold :foreground "#4183C4"))))
+ `(magit-diff-file-header ((,class (:height 1.1 :weight bold :foreground "#4183C4"))))
`(magit-diff-hunk-header ((,class ,diff-hunk-header)))
`(magit-diff-none ((,class ,diff-none)))
`(magit-header ((,class (:foreground "white" :background "#FF4040"))))
@@ -479,45 +679,78 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(magit-section-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "cornflower blue" :inherit nil))))
`(makefile-space-face ((,class (:background "hot pink"))))
`(makefile-targets ((,class (:weight bold :foreground "blue"))))
- `(match ((,class ,match)))
+ ;; `(markdown-blockquote-face ((,class ())))
+ `(markdown-bold-face ((,class (:inherit bold))))
+ ;; `(markdown-comment-face ((,class ())))
+ ;; `(markdown-footnote-face ((,class ())))
+ ;; `(markdown-header-delimiter-face ((,class ())))
+ ;; `(markdown-header-face ((,class ())))
+ `(markdown-header-face-1 ((,class ,ol1)))
+ `(markdown-header-face-2 ((,class ,ol2)))
+ `(markdown-header-face-3 ((,class ,ol3)))
+ `(markdown-header-face-4 ((,class ,ol4)))
+ `(markdown-header-face-5 ((,class ,ol5)))
+ `(markdown-header-face-6 ((,class ,ol6)))
+ ;; `(markdown-header-rule-face ((,class ())))
+ `(markdown-inline-code-face ((,class ,code-inline)))
+ `(markdown-italic-face ((,class (:inherit italic))))
+ `(markdown-language-keyword-face ((,class (:inherit org-block-begin-line))))
+ ;; `(markdown-line-break-face ((,class ())))
+ `(markdown-link-face ((,class ,link-no-underline)))
+ ;; `(markdown-link-title-face ((,class ())))
+ ;; `(markdown-list-face ((,class ())))
+ ;; `(markdown-math-face ((,class ())))
+ ;; `(markdown-metadata-key-face ((,class ())))
+ ;; `(markdown-metadata-value-face ((,class ())))
+ ;; `(markdown-missing-link-face ((,class ())))
+ `(markdown-pre-face ((,class (:inherit org-block-background))))
+ ;; `(markdown-reference-face ((,class ())))
+ ;; `(markdown-strike-through-face ((,class ())))
+ `(markdown-url-face ((,class ,link)))
+ `(match ((,class ,match))) ; Used for grep matches.
+ `(mc/cursor-bar-face ((,class (:height 1.0 :foreground "#1664C4" :background "#1664C4"))))
+ `(mc/cursor-face ((,class (:inverse-video t))))
+ `(mc/region-face ((,class (:inherit region))))
`(mm-uu-extract ((,class ,code-block)))
`(moccur-current-line-face ((,class (:foreground "black" :background "#FFFFCC"))))
`(moccur-face ((,class (:foreground "black" :background "#FFFF99"))))
- `(next-error ((,class ,volatile-highlight)))
+ `(next-error ((,class ,volatile-highlight-supersize)))
`(nobreak-space ((,class (:background "#CCE8F6"))))
- `(nxml-attribute-local-name-face ((,class (:foreground "magenta"))))
+ `(nxml-attribute-local-name-face ((,class ,xml-attribute)))
`(nxml-attribute-value-delimiter-face ((,class (:foreground "green4"))))
`(nxml-attribute-value-face ((,class (:foreground "green4"))))
`(nxml-comment-content-face ((,class (:slant italic :foreground "red"))))
`(nxml-comment-delimiter-face ((,class (:foreground "red"))))
- `(nxml-element-local-name ((,class (:box (:line-width 1 :color "#999999") :foreground "#000088" :background "#DEDEDE"))))
+ `(nxml-element-local-name ((,class ,xml-tag)))
`(nxml-element-local-name-face ((,class (:foreground "blue"))))
`(nxml-processing-instruction-target-face ((,class (:foreground "purple1"))))
`(nxml-tag-delimiter-face ((,class (:foreground "blue"))))
`(nxml-tag-slash-face ((,class (:foreground "blue"))))
`(org-agenda-block-count ((,class (:weight bold :foreground "#A5A5A5"))))
- `(org-agenda-calendar-event ((,class (:weight bold :foreground "#3774CC" :background "#A8C5EF"))))
- `(org-agenda-calendar-sexp ((,class (:foreground "#777777" :background "#E4EBFE"))))
+ `(org-agenda-calendar-event ((,class (:weight bold :foreground "#3774CC" :background "#E4EBFE"))))
+ `(org-agenda-calendar-sexp ((,class (:foreground "#327ACD" :background "#F3F7FC"))))
`(org-agenda-clocking ((,class (:foreground "black" :background "#EEC900"))))
`(org-agenda-column-dateline ((,class ,column)))
`(org-agenda-current-time ((,class (:underline t :foreground "#1662AF"))))
- `(org-agenda-date ((,class (:height 1.6 :weight bold :foreground "#1662AF"))))
- `(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
- `(org-agenda-date-weekend ((,class (:height 1.6 :weight bold :foreground "#4E4E4E"))))
+ `(org-agenda-date ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#1662AF"))))
+ `(org-agenda-date-today ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(org-agenda-date-weekend ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#4E4E4E"))))
`(org-agenda-diary ((,class (:weight bold :foreground "green4" :background "light blue"))))
`(org-agenda-dimmed-todo-face ((,class (:foreground "gold2"))))
`(org-agenda-done ((,class (:foreground "#555555"))))
`(org-agenda-filter-category ((,class (:weight bold :foreground "orange"))))
+ `(org-agenda-filter-effort ((,class (:weight bold :foreground "orange"))))
+ `(org-agenda-filter-regexp ((,class (:weight bold :foreground "orange"))))
`(org-agenda-filter-tags ((,class (:weight bold :foreground "orange"))))
`(org-agenda-restriction-lock ((,class (:background "#E77D63"))))
- `(org-agenda-structure ((,class (:height 1.6 :weight bold :foreground "#1F8DD6"))))
+ `(org-agenda-structure ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#1F8DD6"))))
`(org-archived ((,class (:foreground "gray70"))))
`(org-beamer-tag ((,class (:box (:line-width 1 :color "#FABC18") :foreground "#2C2C2C" :background "#FFF8D0"))))
`(org-block ((,class ,code-block)))
- `(org-block-background ((,class (:background "#FFFFE0"))))
- `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
- `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
- `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "white" :background "#777777"))))
+ `(org-block-background ((,class (:background "#FFFFE0" :extend t)))) ;; :inherit fixed-pitch))))
+ `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5" :extend t))))
+ `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5" :extend t))))
+ `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "#123555" :background "#A3A3A3"))))
`(org-clock-overlay ((,class (:foreground "white" :background "SkyBlue4"))))
`(org-code ((,class ,code-inline)))
`(org-column ((,class ,column)))
@@ -527,14 +760,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(org-dim ((,class (:foreground "#AAAAAA"))))
`(org-document-info ((,class (:foreground "#484848"))))
`(org-document-info-keyword ((,class (:foreground "#008ED1" :background "#EAEAFF"))))
- `(org-document-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "black"))))
+ `(org-document-title ((,class (:height 1.8 :weight bold :foreground "black"))))
`(org-done ((,class (:weight bold :box (:line-width 1 :color "#BBBBBB") :foreground "#BBBBBB" :background "#F0F0F0"))))
- `(org-drawer ((,class (:foreground "light sky blue"))))
- `(org-ellipsis ((,class (:underline nil :box (:line-width 1 :color "#999999") :foreground "#999999" :background "#FFF8C0")))) ; #FFEE62
+ `(org-drawer ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA" :extend nil))))
+ `(org-ellipsis ((,class (:underline nil :foreground "#999999")))) ; #FFEE62
`(org-example ((,class (:foreground "blue" :background "#EAFFEA"))))
`(org-footnote ((,class (:underline t :foreground "#008ED1"))))
`(org-formula ((,class (:foreground "chocolate1"))))
- `(org-headline-done ((,class (:height 1.0 :weight normal :strike-through t :foreground "#ADADAD"))))
+ `(org-headline-done ((,class (:height 1.0 :weight normal :foreground "#ADADAD"))))
`(org-hide ((,class (:foreground "#E2E2E2"))))
`(org-inlinetask ((,class (:box (:line-width 1 :color "#EBEBEB") :foreground "#777777" :background "#FFFFD6"))))
`(org-latex-and-related ((,class (:foreground "#336699" :background "white"))))
@@ -548,25 +781,25 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(org-level-8 ((,class ,ol8)))
`(org-link ((,class ,link)))
`(org-list-dt ((,class (:weight bold :foreground "#335EA8"))))
- `(org-macro ((,class (:foreground "white" :background "#EDB802"))))
+ `(org-macro ((,class (:weight bold :foreground "#EDB802"))))
`(org-meta-line ((,class (:slant normal :foreground "#008ED1" :background "#EAEAFF"))))
- `(org-mode-line-clock ((,class ,clock-line)))
+ `(org-mode-line-clock ((,class (:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#FFA335"))))
`(org-mode-line-clock-overrun ((,class (:weight bold :box (:line-width 1 :color "#335EA8") :foreground "white" :background "#FF4040"))))
`(org-number-of-items ((,class (:weight bold :foreground "white" :background "#79BA79"))))
`(org-property-value ((,class (:foreground "#00A000"))))
`(org-quote ((,class (:slant italic :foreground "dim gray" :background "#FFFFE0"))))
`(org-scheduled ((,class (:foreground "#333333"))))
- `(org-scheduled-previously ((,class (:foreground "#F22659"))))
+ `(org-scheduled-previously ((,class (:foreground "#1466C6"))))
`(org-scheduled-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
`(org-sexp-date ((,class (:foreground "#3774CC"))))
`(org-special-keyword ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA"))))
- `(org-table ((,class (:foreground "dark green" :background "#EAFFEA"))))
+ `(org-table ((,class (:foreground "dark green" :background "#EAFFEA")))) ;; :inherit fixed-pitch))))
`(org-tag ((,class (:weight normal :slant italic :foreground "#9A9FA4" :background "white"))))
- `(org-target ((,class ,link)))
+ `(org-target ((,class (:foreground "#FF6DAF"))))
`(org-time-grid ((,class (:foreground "#CFCFCF"))))
`(org-todo ((,class (:weight bold :box (:line-width 1 :color "#D8ABA7") :foreground "#D8ABA7" :background "#FFE6E4"))))
`(org-upcoming-deadline ((,class (:foreground "#FF5555"))))
- `(org-verbatim ((,class (:foreground "#0066CC"))))
+ `(org-verbatim ((,class (:foreground "#0066CC" :background "#F7FDFF"))))
`(org-verse ((,class (:slant italic :foreground "dim gray" :background "#EEEEEE"))))
`(org-warning ((,class (:weight bold :foreground "black" :background "#CCE7FF"))))
`(outline-1 ((,class ,ol1)))
@@ -577,17 +810,17 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(outline-6 ((,class ,ol6)))
`(outline-7 ((,class ,ol7)))
`(outline-8 ((,class ,ol8)))
- `(pabbrev-debug-display-label-face ((,class (:background "chartreuse"))))
+ `(pabbrev-debug-display-label-face ((,class (:foreground "white" :background "#A62154"))))
`(pabbrev-suggestions-face ((,class (:weight bold :foreground "white" :background "red"))))
`(pabbrev-suggestions-label-face ((,class (:weight bold :foreground "white" :background "purple"))))
`(paren-face-match ((,class ,paren-matched)))
`(paren-face-mismatch ((,class ,paren-unmatched)))
`(paren-face-no-match ((,class ,paren-unmatched)))
`(persp-selected-face ((,class (:weight bold :foreground "#EEF5FE"))))
- `(powerline-active1 ((,class (:background "grey22" :inherit mode-line))))
- `(powerline-active2 ((,class (:background "#4070B6" :inherit mode-line))))
- `(powerline-inactive1 ((,class (:background "#686868" :inherit mode-line-inactive))))
- `(powerline-inactive2 ((,class (:background "#A9A9A9" :inherit mode-line-inactive))))
+ `(powerline-active1 ((,class (:foreground "#85CEEB" :background "#383838" :inherit mode-line))))
+ `(powerline-active2 ((,class (:foreground "#85CEEB" :background "#4070B6" :inherit mode-line))))
+ `(powerline-inactive1 ((,class (:foreground "#F0F0EF" :background "#686868" :inherit mode-line-inactive))))
+ `(powerline-inactive2 ((,class (:foreground "#F0F0EF" :background "#A9A9A9" :inherit mode-line-inactive))))
`(rainbow-delimiters-depth-1-face ((,class (:foreground "#707183"))))
`(rainbow-delimiters-depth-2-face ((,class (:foreground "#7388D6"))))
`(rainbow-delimiters-depth-3-face ((,class (:foreground "#909183"))))
@@ -599,29 +832,33 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(rainbow-delimiters-depth-9-face ((,class (:foreground "#887070"))))
`(rainbow-delimiters-mismatched-face ((,class ,paren-unmatched)))
`(rainbow-delimiters-unmatched-face ((,class ,paren-unmatched)))
- `(realgud-overlay-arrow1 ((,class (:foreground "#005522"))))
- `(realgud-overlay-arrow2 ((,class (:foreground "#c18401"))))
- `(realgud-overlay-arrow3 ((,class (:foreground "#909183"))))
- `(realgud-bp-disabled-face ((,class (:foreground "#909183"))))
- `(realgud-bp-line-enabled-face ((,class (:underline "red"))))
- `(realgud-bp-line-disabled-face ((,class (:underline "#909183"))))
- `(realgud-file-name ((,class :foreground "#005522")))
- `(realgud-line-number ((,class :foreground "#A535AE")))
- `(realgud-backtrace-number ((,class :foreground "#A535AE" :weight bold)))
`(recover-this-file ((,class (:weight bold :background "#FF3F3F"))))
`(rng-error ((,class (:weight bold :foreground "red" :background "#FBE3E4"))))
`(sh-heredoc ((,class (:foreground "blue" :background "#EEF5FE"))))
`(sh-quoted-exec ((,class (:foreground "#FF1493"))))
- `(shadow ((,class ,shadow)))
+ `(shadow ((,class ,shadow))) ; Used for grep context lines.
`(shell-option-face ((,class (:foreground "forest green"))))
`(shell-output-2-face ((,class (:foreground "blue"))))
`(shell-output-3-face ((,class (:foreground "purple"))))
`(shell-output-face ((,class (:foreground "black"))))
;; `(shell-prompt-face ((,class (:weight bold :foreground "yellow"))))
+ `(shm-current-face ((,class (:background "#EEE8D5"))))
+ `(shm-quarantine-face ((,class (:background "lemonchiffon"))))
`(show-paren-match ((,class ,paren-matched)))
`(show-paren-mismatch ((,class ,paren-unmatched)))
`(sml-modeline-end-face ((,class (:background "#6BADF6")))) ; #335EA8
`(sml-modeline-vis-face ((,class (:background "#1979CA"))))
+ `(term ((,class (:foreground "#333333" :background "#FFFFFF"))))
+
+ ;; `(sp-pair-overlay-face ((,class ())))
+ ;; `(sp-show-pair-enclosing ((,class ())))
+ ;; `(sp-show-pair-match-face ((,class ()))) ; ~ Pair highlighting (matching tags).
+ ;; `(sp-show-pair-mismatch-face ((,class ())))
+ ;; `(sp-wrap-overlay-closing-pair ((,class ())))
+ ;; `(sp-wrap-overlay-face ((,class ())))
+ ;; `(sp-wrap-overlay-opening-pair ((,class ())))
+ ;; `(sp-wrap-tag-overlay-face ((,class ())))
+
`(speedbar-button-face ((,class (:foreground "green4"))))
`(speedbar-directory-face ((,class (:foreground "blue4"))))
`(speedbar-file-face ((,class (:foreground "cyan4"))))
@@ -639,7 +876,6 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(tex-verbatim ((,class (:foreground "blue"))))
`(tool-bar ((,class (:box (:line-width 1 :style released-button) :foreground "black" :background "gray75"))))
`(tooltip ((,class (:foreground "black" :background "light yellow"))))
- `(trailing-whitespace ((,class (:background "#F6EBFE"))))
`(traverse-match-face ((,class (:weight bold :foreground "blue violet"))))
`(vc-annotate-face-3F3FFF ((,class (:foreground "#3F3FFF" :background "black"))))
`(vc-annotate-face-3F6CFF ((,class (:foreground "#3F3FFF" :background "black"))))
@@ -654,11 +890,24 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(vc-annotate-face-83FF3F ((,class (:foreground "#B0FF3F" :background "black"))))
`(vc-annotate-face-B0FF3F ((,class (:foreground "#B0FF3F" :background "black"))))
`(vc-annotate-face-DDFF3F ((,class (:foreground "#FFF33F" :background "black"))))
+ `(vc-annotate-face-F6FFCC ((,class (:foreground "black" :background "#FFFFC0"))))
`(vc-annotate-face-FF3F3F ((,class (:foreground "#FF3F3F" :background "black"))))
`(vc-annotate-face-FF6C3F ((,class (:foreground "#FF3F3F" :background "black"))))
`(vc-annotate-face-FF993F ((,class (:foreground "#FF993F" :background "black"))))
`(vc-annotate-face-FFC63F ((,class (:foreground "#FF993F" :background "black"))))
`(vc-annotate-face-FFF33F ((,class (:foreground "#FFF33F" :background "black"))))
+
+ ;; ;; vc
+ ;; (vc-up-to-date-state ((,c :foreground ,(gc 'green-1))))
+ ;; (vc-edited-state ((,c :foreground ,(gc 'yellow+1))))
+ ;; (vc-missing-state ((,c :foreground ,(gc 'red))))
+ ;; (vc-conflict-state ((,c :foreground ,(gc 'red+2) :weight bold)))
+ ;; (vc-locked-state ((,c :foreground ,(gc 'cyan-1))))
+ ;; (vc-locally-added-state ((,c :foreground ,(gc 'blue))))
+ ;; (vc-needs-update-state ((,c :foreground ,(gc 'magenta))))
+ ;; (vc-removed-state ((,c :foreground ,(gc 'red-1))))
+
+ `(vhl/default-face ((,class ,volatile-highlight))) ; `volatile-highlights.el' (for undo, yank).
`(w3m-anchor ((,class ,link)))
`(w3m-arrived-anchor ((,class (:foreground "purple1"))))
`(w3m-bitmap-image-face ((,class (:foreground "gray4" :background "green"))))
@@ -675,38 +924,139 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(w3m-link-numbering ((,class (:foreground "#B4C7EB")))) ; mouseless browsing
`(w3m-strike-through-face ((,class (:strike-through t))))
`(w3m-underline-face ((,class (:underline t))))
- `(which-func ((,class (:weight bold :foreground "white"))))
+
+ ;; `(web-mode-block-attr-name-face ((,class ())))
+ ;; `(web-mode-block-attr-value-face ((,class ())))
+ ;; `(web-mode-block-comment-face ((,class ())))
+ ;; `(web-mode-block-control-face ((,class ())))
+ ;; `(web-mode-block-delimiter-face ((,class ())))
+ ;; `(web-mode-block-face ((,class ())))
+ ;; `(web-mode-block-string-face ((,class ())))
+ ;; `(web-mode-bold-face ((,class ())))
+ ;; `(web-mode-builtin-face ((,class ())))
+ ;; `(web-mode-comment-face ((,class ())))
+ ;; `(web-mode-comment-keyword-face ((,class ())))
+ ;; `(web-mode-constant-face ((,class ())))
+ ;; `(web-mode-css-at-rule-face ((,class ())))
+ ;; `(web-mode-css-color-face ((,class ())))
+ ;; `(web-mode-css-comment-face ((,class ())))
+ ;; `(web-mode-css-function-face ((,class ())))
+ ;; `(web-mode-css-priority-face ((,class ())))
+ ;; `(web-mode-css-property-name-face ((,class ())))
+ ;; `(web-mode-css-pseudo-class-face ((,class ())))
+ ;; `(web-mode-css-selector-face ((,class ())))
+ ;; `(web-mode-css-string-face ((,class ())))
+ ;; `(web-mode-css-variable-face ((,class ())))
+ ;; `(web-mode-current-column-highlight-face ((,class ())))
+ `(web-mode-current-element-highlight-face ((,class (:background "#99CCFF")))) ; #FFEE80
+ ;; `(web-mode-doctype-face ((,class ())))
+ ;; `(web-mode-error-face ((,class ())))
+ ;; `(web-mode-filter-face ((,class ())))
+ `(web-mode-folded-face ((,class (:box (:line-width 1 :color "#777777") :foreground "#9A9A6A" :background "#F3F349"))))
+ ;; `(web-mode-function-call-face ((,class ())))
+ ;; `(web-mode-function-name-face ((,class ())))
+ ;; `(web-mode-html-attr-custom-face ((,class ())))
+ ;; `(web-mode-html-attr-engine-face ((,class ())))
+ ;; `(web-mode-html-attr-equal-face ((,class ())))
+ `(web-mode-html-attr-name-face ((,class ,xml-attribute)))
+ ;; `(web-mode-html-attr-value-face ((,class ())))
+ ;; `(web-mode-html-entity-face ((,class ())))
+ `(web-mode-html-tag-bracket-face ((,class ,xml-tag)))
+ ;; `(web-mode-html-tag-custom-face ((,class ())))
+ `(web-mode-html-tag-face ((,class ,xml-tag)))
+ ;; `(web-mode-html-tag-namespaced-face ((,class ())))
+ ;; `(web-mode-inlay-face ((,class ())))
+ ;; `(web-mode-italic-face ((,class ())))
+ ;; `(web-mode-javascript-comment-face ((,class ())))
+ ;; `(web-mode-javascript-string-face ((,class ())))
+ ;; `(web-mode-json-comment-face ((,class ())))
+ ;; `(web-mode-json-context-face ((,class ())))
+ ;; `(web-mode-json-key-face ((,class ())))
+ ;; `(web-mode-json-string-face ((,class ())))
+ ;; `(web-mode-jsx-depth-1-face ((,class ())))
+ ;; `(web-mode-jsx-depth-2-face ((,class ())))
+ ;; `(web-mode-jsx-depth-3-face ((,class ())))
+ ;; `(web-mode-jsx-depth-4-face ((,class ())))
+ ;; `(web-mode-keyword-face ((,class ())))
+ ;; `(web-mode-param-name-face ((,class ())))
+ ;; `(web-mode-part-comment-face ((,class ())))
+ `(web-mode-part-face ((,class (:background "#FFFFE0"))))
+ ;; `(web-mode-part-string-face ((,class ())))
+ ;; `(web-mode-preprocessor-face ((,class ())))
+ `(web-mode-script-face ((,class (:background "#EFF0F1"))))
+ ;; `(web-mode-sql-keyword-face ((,class ())))
+ ;; `(web-mode-string-face ((,class ())))
+ ;; `(web-mode-style-face ((,class ())))
+ ;; `(web-mode-symbol-face ((,class ())))
+ ;; `(web-mode-type-face ((,class ())))
+ ;; `(web-mode-underline-face ((,class ())))
+ ;; `(web-mode-variable-name-face ((,class ())))
+ ;; `(web-mode-warning-face ((,class ())))
+ ;; `(web-mode-whitespace-face ((,class ())))
+
+ `(which-func ((,class (:weight bold :slant italic :foreground "white"))))
+ ;; `(which-key-command-description-face)
+ ;; `(which-key-group-description-face)
+ ;; `(which-key-highlighted-command-face)
+ ;; `(which-key-key-face)
+ `(which-key-local-map-description-face ((,class (:weight bold :background "#F3F7FC" :inherit which-key-command-description-face))))
+ ;; `(which-key-note-face)
+ ;; `(which-key-separator-face)
+ ;; `(which-key-special-key-face)
`(widget-button ((,class ,link)))
`(widget-button-pressed ((,class (:foreground "red"))))
`(widget-documentation ((,class (:foreground "green4"))))
`(widget-field ((,class (:background "gray85"))))
`(widget-inactive ((,class (:foreground "dim gray"))))
`(widget-single-line-field ((,class (:background "gray85"))))
- `(yas/field-debug-face ((,class (:background "ivory2"))))
- `(yas/field-highlight-face ((,class (:background "DarkSeaGreen1"))))
+ `(woman-bold ((,class (:weight bold :foreground "#F13D3D"))))
+ `(woman-italic ((,class (:weight bold :slant italic :foreground "#46BE1B"))))
+ `(woman-symbol ((,class (:weight bold :foreground "purple"))))
+ `(yas-field-debug-face ((,class (:foreground "white" :background "#A62154"))))
+ `(yas-field-highlight-face ((,class (:box (:line-width 1 :color "#838383") :foreground "black" :background "#D4DCD8"))))
+
+ ;; `(ztreep-arrow-face ((,class ())))
+ ;; `(ztreep-diff-header-face ((,class ())))
+ ;; `(ztreep-diff-header-small-face ((,class ())))
+ `(ztreep-diff-model-add-face ((,class (:weight bold :foreground "#008800"))))
+ `(ztreep-diff-model-diff-face ((,class (:weight bold :foreground "#0044DD"))))
+ `(ztreep-diff-model-ignored-face ((,class (:strike-through t :foreground "#9E9E9E"))))
+ `(ztreep-diff-model-normal-face ((,class (:foreground "#000000"))))
+ ;; `(ztreep-expand-sign-face ((,class ())))
+ ;; `(ztreep-header-face ((,class ())))
+ ;; `(ztreep-leaf-face ((,class ())))
+ ;; `(ztreep-node-face ((,class ())))
+
))
(custom-theme-set-variables 'leuven
- '(ansi-color-faces-vector
- [default default default italic underline success warning error])
- '(ansi-color-names-vector
- ["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"])
- ; colors used in Shell mode
+
+ ;; highlight-sexp-mode.
+ '(hl-sexp-background-color "#efebe9")
+
+ '(ansi-color-faces-vector
+ [default default default italic underline success warning error])
+
+ ;; Colors used in Shell mode.
+ '(ansi-color-names-vector
+ ["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"])
)
;;;###autoload
(when (and (boundp 'custom-theme-load-path)
load-file-name)
- ;; add theme folder to `custom-theme-load-path' when installing over MELPA
+ ;; Add theme folder to `custom-theme-load-path' when installing over MELPA.
(add-to-list 'custom-theme-load-path
(file-name-as-directory (file-name-directory load-file-name))))
(provide-theme 'leuven)
+;; This is for the sake of Emacs.
;; Local Variables:
+;; no-byte-compile: t
+;; time-stamp-end: "$"
;; time-stamp-format: "%:y%02m%02d.%02H%02M"
;; time-stamp-start: "Version: "
-;; time-stamp-end: "$"
;; End:
;;; leuven-theme.el ends here
--
2.21.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-04-24 12:09 ` Fab Rice
@ 2020-04-25 8:49 ` Eli Zaretskii
2020-04-25 14:36 ` Dmitry Gutov
2020-05-09 16:48 ` Stefan Kangas
1 sibling, 1 reply; 15+ messages in thread
From: Eli Zaretskii @ 2020-04-25 8:49 UTC (permalink / raw)
To: Fab Rice; +Cc: 40759, stefan, Stefan Monnier, egrep, dgutov
> Date: Fri, 24 Apr 2020 14:09:56 +0200
> From: Fab Rice <posh18@pirilampo.be>
> Cc: Serghei <egrep@protonmail.ch>, stefan@marxist.se, 40759@debbugs.gnu.org,
> dgutov@yandex.ru
>
> +(defgroup leuven nil
> + "Leuven theme options.
> +The theme has to be reloaded after changing anything in this group."
> + :group 'faces)
> +
> +(defcustom leuven-scale-outline-headlines t
> + "Scale `outline' (and `org') level-1 headlines.
> +This can be nil for unscaled, t for using the theme default, or a scaling
> +number."
> + :type '(choice
> + (const :tag "Unscaled" nil)
> + (const :tag "Default provided by theme" t)
> + (number :tag "Set scaling"))
> + :group 'leuven)
> +
> +(defcustom leuven-scale-org-agenda-structure t
> + "Scale Org agenda structure lines, like dates.
> +This can be nil for unscaled, t for using the theme default, or a scaling
> +number."
> + :type '(choice
> + (const :tag "Unscaled" nil)
> + (const :tag "Default provided by theme" t)
> + (number :tag "Set scaling")))
We don't have defcustom's in any other theme I see in etc/themes/.
Does 'disable-theme' know how to undo the defcustom's, i.e. makunbound
them so that they are no longer in the name-space? should it? If so,
I think we should add such a feature, and only after that we will be
able to accept themes that define new user options.
> +(defun leuven-scale-font (control default-height)
> + "Function for splicing optional font heights into face descriptions.
> +CONTROL can be a number, nil, or t. When t, use DEFAULT-HEIGHT."
> + (cond
> + ((numberp control) (list :height control))
> + ((eq t control) (list :height default-height))
> + (t nil)))
Likewise with functions: should 'disable-theme' fmakunbound them?
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-04-25 8:49 ` Eli Zaretskii
@ 2020-04-25 14:36 ` Dmitry Gutov
2020-05-04 12:35 ` Stefan Kangas
0 siblings, 1 reply; 15+ messages in thread
From: Dmitry Gutov @ 2020-04-25 14:36 UTC (permalink / raw)
To: Eli Zaretskii, Fab Rice; +Cc: 40759, stefan, Stefan Monnier, egrep
On 25.04.2020 11:49, Eli Zaretskii wrote:
> We don't have defcustom's in any other theme I see in etc/themes/.
> Does 'disable-theme' know how to undo the defcustom's, i.e. makunbound
> them so that they are no longer in the name-space? should it?
I don't think it's a major problem, personally: these variables serve a
purpose, and they don't hurt anybody by remaining defined.
Same with functions.
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-04-25 14:36 ` Dmitry Gutov
@ 2020-05-04 12:35 ` Stefan Kangas
2020-05-04 14:58 ` Eli Zaretskii
0 siblings, 1 reply; 15+ messages in thread
From: Stefan Kangas @ 2020-05-04 12:35 UTC (permalink / raw)
To: Dmitry Gutov; +Cc: Fab Rice, 40759, egrep, Stefan Monnier
Dmitry Gutov <dgutov@yandex.ru> writes:
> On 25.04.2020 11:49, Eli Zaretskii wrote:
>> We don't have defcustom's in any other theme I see in etc/themes/.
>> Does 'disable-theme' know how to undo the defcustom's, i.e. makunbound
>> them so that they are no longer in the name-space? should it?
>
> I don't think it's a major problem, personally: these variables serve a purpose,
> and they don't hurt anybody by remaining defined.
>
> Same with functions.
I agree with that conclusion, too. I think it's fine that a theme
does this. Maybe we could file a wishlist level request to add the
makunbound functionality if we think it's worth working on.
Is there anything left to discuss, or should I go ahead and push this?
Also, I think we would need Eli to decide if this should go to
emacs-27 or master. Thanks.
Best regards,
Stefan Kangas
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-05-04 12:35 ` Stefan Kangas
@ 2020-05-04 14:58 ` Eli Zaretskii
2020-05-04 15:11 ` Stefan Kangas
0 siblings, 1 reply; 15+ messages in thread
From: Eli Zaretskii @ 2020-05-04 14:58 UTC (permalink / raw)
To: Stefan Kangas; +Cc: 40759, posh18, monnier, egrep, dgutov
> From: Stefan Kangas <stefan@marxist.se>
> Cc: Eli Zaretskii <eliz@gnu.org>, Fab Rice <posh18@pirilampo.be>,
> 40759@debbugs.gnu.org, Stefan Monnier <monnier@iro.umontreal.ca>,
> egrep@protonmail.ch
> Date: Mon, 04 May 2020 14:35:34 +0200
>
> > I don't think it's a major problem, personally: these variables serve a purpose,
> > and they don't hurt anybody by remaining defined.
> >
> > Same with functions.
>
> I agree with that conclusion, too. I think it's fine that a theme
> does this. Maybe we could file a wishlist level request to add the
> makunbound functionality if we think it's worth working on.
>
> Is there anything left to discuss, or should I go ahead and push this?
>
> Also, I think we would need Eli to decide if this should go to
> emacs-27 or master. Thanks.
Frankly, I'm a bit afraid that such a significant deviation from the
practice of themes should be added to the release branch now.
Stefan's opinion notwithstanding, there can always be something we are
overlooking.
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-05-04 14:58 ` Eli Zaretskii
@ 2020-05-04 15:11 ` Stefan Kangas
0 siblings, 0 replies; 15+ messages in thread
From: Stefan Kangas @ 2020-05-04 15:11 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: 40759, posh18, monnier, egrep, dgutov
Eli Zaretskii <eliz@gnu.org> writes:
> Frankly, I'm a bit afraid that such a significant deviation from the
> practice of themes should be added to the release branch now.
> Stefan's opinion notwithstanding, there can always be something we are
> overlooking.
Thank you. I will allow a couple of days before I push this to
master, in case anyone has any further comments. We should be able to
fix any problems that pop up in time before 28.1 is released.
Best regards,
Stefan Kangas
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-04-24 12:09 ` Fab Rice
2020-04-25 8:49 ` Eli Zaretskii
@ 2020-05-09 16:48 ` Stefan Kangas
2020-05-13 17:36 ` Fab Rice
1 sibling, 1 reply; 15+ messages in thread
From: Stefan Kangas @ 2020-05-09 16:48 UTC (permalink / raw)
To: Fab Rice, Eli Zaretskii; +Cc: 40759, Serghei, dgutov
Fab Rice <posh18@pirilampo.be> writes:
> Here's an updated patch file, where I've fixed the issues pointed by Stefan.
Thank you. I intended to push this today, but it seems like you haven't
merged the changes in Emacs into your version.
Could you please look into that and suggest how to best proceed?
Possibly you could just merge the changes and send a new patch.
I have marked some differences I could find below, but I think you would
need to review all this in full.
> - (code-inline '(:foreground "#006400" :background "#FDFFF7"))
> + (code-block '(:foreground "#000088" :background "#FFFFE0" :extend t))
> + (code-inline '(:foreground "#006400" :background "#FDFFF7" :extend t))
The :extend attributes has been removed on purpose.
See emacs.git commit 58fb4c3e68a and etc/NEWS.27.
> + ;; `(font-lock-doc-string-face ((,class (:foreground "#008000")))) ; XEmacs only, but is used for HTML exports from org2html (and not interactively)
This line was removed in emacs.git commit 16ec5f5f2ff.
> ;; Local Variables:
> +;; no-byte-compile: t
This line was removed in emacs.git commit 530aa469a4d.
Sorry for not noticing any of this earlier.
Best regards,
Stefan Kangas
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-05-09 16:48 ` Stefan Kangas
@ 2020-05-13 17:36 ` Fab Rice
2020-08-08 12:23 ` Lars Ingebrigtsen
0 siblings, 1 reply; 15+ messages in thread
From: Fab Rice @ 2020-05-13 17:36 UTC (permalink / raw)
To: Stefan Kangas; +Cc: 40759, Serghei, dgutov
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
Dear Stefan,
Le 2020-05-09 18:48, Stefan Kangas a écrit :
> Fab Rice <posh18@pirilampo.be> writes:
>
>> Here's an updated patch file, where I've fixed the issues pointed by
>> Stefan.
I've pushed new changes, following your 3 (types of) remarks.
Please find it here, attached.
Thanks a lot!
Best regards,
Fabrice
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Update-Leuven-theme.patch --]
[-- Type: text/x-diff; name=0001-Update-Leuven-theme.patch, Size: 69878 bytes --]
From 3057962b84efaed04978aa55dcc8bd618bafc7ef Mon Sep 17 00:00:00 2001
From: Fabrice Niessen <fniessen@pirilampo.org>
Date: Wed, 13 May 2020 19:30:13 +0200
Subject: [PATCH 6/6] Update Leuven-theme
---
etc/themes/leuven-theme.el | 683 ++++++++++++++++++++++++++++---------
1 file changed, 516 insertions(+), 167 deletions(-)
diff --git etc/themes/leuven-theme.el etc/themes/leuven-theme.el
index 4d8568b7d8..fc91ae07d0 100644
--- etc/themes/leuven-theme.el
+++ etc/themes/leuven-theme.el
@@ -4,7 +4,7 @@
;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
;; URL: https://github.com/fniessen/emacs-leuven-theme
-;; Version: 20170912.2328
+;; Version: 20200513.1928
;; Keywords: color theme
;; This file is part of GNU Emacs.
@@ -31,42 +31,98 @@
;;
;; (load-theme 'leuven t)
;;
-;; Requirements: Emacs 24.
+;; Requirements: Emacs 24+.
+;;
+;; NOTE -- Would you like implement a version of this for dark backgrounds,
+;; please do so! I'm willing to integrate it...
;;; Code:
+;;; Options.
+
+(defgroup leuven nil
+ "Leuven theme options.
+The theme has to be reloaded after changing anything in this group."
+ :group 'faces)
+
+(defcustom leuven-scale-outline-headlines t
+ "Scale `outline' (and `org') level-1 headlines.
+This can be nil for unscaled, t for using the theme default, or a scaling
+number."
+ :type '(choice
+ (const :tag "Unscaled" nil)
+ (const :tag "Default provided by theme" t)
+ (number :tag "Set scaling"))
+ :group 'leuven)
+
+(defcustom leuven-scale-org-agenda-structure t
+ "Scale Org agenda structure lines, like dates.
+This can be nil for unscaled, t for using the theme default, or a scaling
+number."
+ :type '(choice
+ (const :tag "Unscaled" nil)
+ (const :tag "Default provided by theme" t)
+ (number :tag "Set scaling")))
+
+(defun leuven-scale-font (control default-height)
+ "Function for splicing optional font heights into face descriptions.
+CONTROL can be a number, nil, or t. When t, use DEFAULT-HEIGHT."
+ (cond
+ ((numberp control) (list :height control))
+ ((eq t control) (list :height default-height))
+ (t nil)))
+
+;;; Theme Faces.
+
(deftheme leuven
"Face colors with a light background.
-Basic, Font Lock, Isearch, Gnus, Message, Diff, Ediff, Flyspell,
-Semantic, and Ansi-Color faces are included -- and much more...")
+Basic, Font Lock, Isearch, Gnus, Message, Org mode, Diff, Ediff,
+Flyspell, Semantic, and Ansi-Color faces are included -- and much
+more...")
(let ((class '((class color) (min-colors 89)))
- ;; Leuven generic colors
- (cancel '(:slant italic :strike-through t :foreground "gray55"))
+ ;; Leuven generic colors.
+ (cancel '(:slant italic :strike-through t :foreground "#A9A9A9"))
(clock-line '(:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#EEC900"))
(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"))
+ (completion-inline '(:weight normal :foreground "#C0C0C0" :inherit hl-line)) ; Like Google.
+ (completion-other-candidates '(:weight bold :foreground "black" :background "#EBF4FE"))
+ (completion-selected-candidate '(:weight bold :foreground "white" :background "#0052A4"))
+ (diff-added '(:background "#DDFFDD"))
(diff-changed '(:foreground "#0000FF" :background "#DDDDFF"))
- (diff-header '(:foreground "#800000" :background "#FFFFAF"))
+ (diff-header '(:weight bold :foreground "#800000" :background "#FFFFAF"))
(diff-hunk-header '(:foreground "#990099" :background "#FFEEFF"))
- (diff-none '(:foreground "gray33"))
- (diff-removed '(:foreground "#A60000" :background "#FFDDDD"))
+ (diff-none '(:foreground "#888888"))
+ (diff-refine-added '(:background "#97F295"))
+ (diff-refine-removed '(:background "#FFB6BA"))
+ (diff-removed '(:background "#FEE8E9"))
(directory '(:weight bold :foreground "blue" :background "#FFFFD2"))
- (highlight-line '(:background "#FFFFD7")) ; #F5F5F5
- (highlight-line-gnus '(:background "#DAEAFC")) ; defined in `gnus-leuven.el'
+ (file '(:foreground "black"))
+ (function-param '(:foreground "#247284"))
+ (grep-file-name '(:weight bold :foreground "#2A489E")) ; Used for grep hits.
+ (grep-line-number '(:weight bold :foreground "#A535AE"))
+ (highlight-blue '(:background "#E6ECFF"))
+ (highlight-blue2 '(:background "#E4F1F9"))
+ (highlight-gray '(:background "#E4E4E3"))
+ (highlight-green '(:background "#D5F1CF"))
+ (highlight-red '(:background "#FFC8C8"))
+ (highlight-yellow '(:background "#F6FECD"))
(link '(:weight normal :underline t :foreground "#006DAF"))
+ (link-no-underline '(:weight normal :foreground "#006DAF"))
(mail-header-name '(:family "Sans Serif" :weight normal :foreground "#A3A3A2"))
(mail-header-other '(:family "Sans Serif" :slant normal :foreground "#666666"))
- (mail-read '(:weight normal :foreground "#86878B"))
- (mail-ticked '(:weight bold :background "#FBE6EF"))
+ (mail-read '(:foreground "#8C8C8C"))
+ (mail-read-high '(:foreground "#808080"))
+ (mail-ticked '(:foreground "#FF3300"))
(mail-to '(:family "Sans Serif" :underline nil :foreground "#006DAF"))
- (mail-unread '(:weight bold :foreground "black"))
- (marked-line '(:weight bold :foreground "white" :background "red"))
- (match '(:weight bold :background "#FBE448")) ; occur patterns
- (ol1 '(:height 1.3 :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0"))
+ (mail-unread '(:weight bold :foreground "#000000"))
+ (mail-unread-high '(:weight bold :foreground "#135985"))
+ (marked-line '(:foreground "#AA0000" :background "#FFAAAA"))
+ (match '(:weight bold :background "#FFFF00")) ; occur patterns + match in helm for files + match in Org files.
+ (ol1 `(,@(leuven-scale-font leuven-scale-outline-headlines 1.3) :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0"))
(ol2 '(:height 1.0 :weight bold :overline "#123555" :foreground "#123555" :background "#E5F4FB"))
(ol3 '(:height 1.0 :weight bold :foreground "#005522" :background "#EFFFEF"))
(ol4 '(:height 1.0 :weight bold :slant normal :foreground "#EA6300"))
@@ -74,15 +130,22 @@ Semantic, and Ansi-Color faces are included -- and much more...")
(ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC"))
(ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C"))
(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"))
+ (paren-matched '(:background "#C0E8C3")) ; Or take that green for region?
+ (paren-unmatched '(:weight bold :underline "red" :foreground "black" :background "#FFA5A5"))
+ (region '(:background "#8ED3FF"))
(shadow '(:foreground "#7F7F7F"))
(string '(:foreground "#008000")) ; or #D0372D
(subject '(:family "Sans Serif" :weight bold :foreground "black"))
- (symlink '(:foreground "deep sky blue"))
- (volatile-highlight '(:underline nil :background "#FFF876"))
- (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA")))
+ (symlink '(:foreground "#1F8DD6"))
+ (tab '(:foreground "#E8E8E8" :background "white"))
+ (trailing '(:foreground "#E8E8E8" :background "#FFFFAB"))
+ (volatile-highlight '(:underline nil :foreground "white" :background "#9E3699"))
+ (volatile-highlight-supersize '(:height 1.1 :underline nil :foreground "white" :background "#9E3699")) ; flash-region
+ (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA"))
+ (xml-attribute '(:foreground "#F36335"))
+ (xml-tag '(:foreground "#AE1B9A"))
+ (highlight-current-tag '(:background "#E8E8FF")) ; #EEF3F6 or #FFEB26
+ )
(custom-theme-set-faces
'leuven
@@ -91,46 +154,48 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(bold-italic ((,class (:weight bold :slant italic :foreground "black"))))
`(italic ((,class (:slant italic :foreground "#1A1A1A"))))
`(underline ((,class (:underline t))))
- `(cursor ((,class (:background "#0FB300"))))
+ `(cursor ((,class (:background "#21BDFF"))))
- ;; Highlighting faces
- `(fringe ((,class (:foreground "#9B9B9B" :background "#EDEDED"))))
- `(highlight ((,class ,volatile-highlight)))
+ ;; Lucid toolkit emacs menus.
+ `(menu ((,class (:foreground "#FFFFFF" :background "#333333"))))
+
+ ;; Highlighting faces.
+ `(fringe ((,class (:foreground "#4C9ED9" :background "white"))))
+ `(highlight ((,class ,highlight-blue)))
`(region ((,class ,region)))
- `(secondary-selection ((,class ,match))) ; used by Org-mode for highlighting matched entries and keywords
- `(isearch ((,class (:weight bold :underline "#FF9632" :foreground nil :background "#FDBD33"))))
- `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FF9999"))))
- `(lazy-highlight ((,class (:underline "#FF9632" :background "#FFFF00")))) ; isearch others
- `(trailing-whitespace ((,class (:background "#FFFF57"))))
- `(whitespace-hspace ((,class (:foreground "#D2D2D2"))))
- `(whitespace-indentation ((,class (:foreground "#A1A1A1" :background "white"))))
+ `(secondary-selection ((,class ,match))) ; Used by Org-mode for highlighting matched entries and keywords.
+ `(isearch ((,class (:underline "black" :foreground "white" :background "#5974AB"))))
+ `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FFCCCC"))))
+ `(lazy-highlight ((,class (:foreground "black" :background "#FFFF00")))) ; Isearch others (see `match').
+ `(trailing-whitespace ((,class ,trailing)))
+ `(query-replace ((,class (:inherit isearch))))
+ `(whitespace-hspace ((,class (:foreground "#D2D2D2")))) ; see also `nobreak-space'
+ `(whitespace-indentation ((,class ,tab)))
`(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88"))))
- `(whitespace-tab ((,class (:foreground "#A1A1A1" :background "white"))))
- `(whitespace-trailing ((,class (:foreground "#B3B3B3" :background "#FFFF57"))))
+ `(whitespace-tab ((,class ,tab)))
+ `(whitespace-trailing ((,class ,trailing)))
- ;; Mode line faces
+ ;; Mode line faces.
`(mode-line ((,class (:box (:line-width 1 :color "#1A2F54") :foreground "#85CEEB" :background "#335EA8"))))
`(mode-line-inactive ((,class (:box (:line-width 1 :color "#4E4E4C") :foreground "#F0F0EF" :background "#9B9C97"))))
`(mode-line-buffer-id ((,class (:weight bold :foreground "white"))))
`(mode-line-emphasis ((,class (:weight bold :foreground "white"))))
`(mode-line-highlight ((,class (:foreground "yellow"))))
- ;; Escape and prompt faces
+ ;; Escape and prompt faces.
`(minibuffer-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(minibuffer-noticeable-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(escape-glyph ((,class (:foreground "#008ED1"))))
- `(homoglyph ((,class (:foreground "#008ED1"))))
`(error ((,class (:foreground "red"))))
`(warning ((,class (:weight bold :foreground "orange"))))
`(success ((,class (:foreground "green"))))
- ;; Font lock faces
+ ;; Font lock faces.
`(font-lock-builtin-face ((,class (:foreground "#006FE0"))))
`(font-lock-comment-delimiter-face ((,class (:foreground "#8D8D84")))) ; #696969
`(font-lock-comment-face ((,class (:slant italic :foreground "#8D8D84")))) ; #696969
`(font-lock-constant-face ((,class (:foreground "#D0372D"))))
`(font-lock-doc-face ((,class (:foreground "#036A07"))))
- ;; `(font-lock-doc-string-face ((,class (:foreground "#008000")))) ; XEmacs only, but is used for HTML exports from org2html (and not interactively)
`(font-lock-function-name-face ((,class (:weight normal :foreground "#006699"))))
`(font-lock-keyword-face ((,class (:bold nil :foreground "#0000FF")))) ; #3654DC
`(font-lock-preprocessor-face ((,class (:foreground "#808080"))))
@@ -141,32 +206,32 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(font-lock-variable-name-face ((,class (:weight normal :foreground "#BA36A5")))) ; #800080
`(font-lock-warning-face ((,class (:weight bold :foreground "red"))))
- ;; Button and link faces
+ ;; Button and link faces.
`(link ((,class ,link)))
`(link-visited ((,class (:underline t :foreground "#E5786D"))))
`(button ((,class (:underline t :foreground "#006DAF"))))
- `(header-line ((,class (:weight bold :underline "black" :overline "black" :foreground "black" :background "#FFFF88"))))
+ `(header-line ((,class (:box (:line-width 1 :color "black") :foreground "black" :background "#F0F0F0"))))
- ;; Gnus faces
+ ;; Gnus faces.
`(gnus-button ((,class (:weight normal))))
`(gnus-cite-attribution-face ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-1 ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-10 ((,class (:foreground "#990000"))))
- `(gnus-cite-face-2 ((,class (:foreground "#660066"))))
- `(gnus-cite-face-3 ((,class (:foreground "#007777"))))
- `(gnus-cite-face-4 ((,class (:foreground "#990000"))))
- `(gnus-cite-face-5 ((,class (:foreground "#000099"))))
- `(gnus-cite-face-6 ((,class (:foreground "#BB6600"))))
- `(gnus-cite-face-7 ((,class (:foreground "#5050B0"))))
- `(gnus-cite-face-8 ((,class (:foreground "#660066"))))
- `(gnus-cite-face-9 ((,class (:foreground "#007777"))))
+ `(gnus-cite-1 ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
+ `(gnus-cite-2 ((,class (:foreground "#660066" :background "#F6F6F6"))))
+ `(gnus-cite-3 ((,class (:foreground "#007777" :background "#F6F6F6"))))
+ `(gnus-cite-4 ((,class (:foreground "#990000" :background "#F6F6F6"))))
+ `(gnus-cite-5 ((,class (:foreground "#000099" :background "#F6F6F6"))))
+ `(gnus-cite-6 ((,class (:foreground "#BB6600" :background "#F6F6F6"))))
+ `(gnus-cite-7 ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
+ `(gnus-cite-8 ((,class (:foreground "#660066" :background "#F6F6F6"))))
+ `(gnus-cite-9 ((,class (:foreground "#007777" :background "#F6F6F6"))))
+ `(gnus-cite-10 ((,class (:foreground "#990000" :background "#F6F6F6"))))
`(gnus-emphasis-bold ((,class (:weight bold))))
`(gnus-emphasis-highlight-words ((,class (:foreground "yellow" :background "black"))))
`(gnus-group-mail-1 ((,class (:weight bold :foreground "#FF50B0"))))
`(gnus-group-mail-1-empty ((,class (:foreground "#5050B0"))))
`(gnus-group-mail-2 ((,class (:weight bold :foreground "#FF0066"))))
`(gnus-group-mail-2-empty ((,class (:foreground "#660066"))))
- `(gnus-group-mail-3 ((,class (:weight bold :foreground "black"))))
+ `(gnus-group-mail-3 ((,class ,mail-unread)))
`(gnus-group-mail-3-empty ((,class ,mail-read)))
`(gnus-group-mail-low ((,class ,cancel)))
`(gnus-group-mail-low-empty ((,class ,cancel)))
@@ -174,8 +239,8 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-group-news-1-empty ((,class (:foreground "#5050B0"))))
`(gnus-group-news-2 ((,class (:weight bold :foreground "#FF0066"))))
`(gnus-group-news-2-empty ((,class (:foreground "#660066"))))
- `(gnus-group-news-3 ((,class (:weight bold :foreground "black"))))
- `(gnus-group-news-3-empty ((,class (:foreground "#808080"))))
+ `(gnus-group-news-3 ((,class ,mail-unread)))
+ `(gnus-group-news-3-empty ((,class ,mail-read)))
`(gnus-group-news-4 ((,class (:weight bold :foreground "#FF0000"))))
`(gnus-group-news-4-empty ((,class (:foreground "#990000"))))
`(gnus-group-news-5 ((,class (:weight bold :foreground "#FF0099"))))
@@ -195,11 +260,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-signature ((,class (:slant italic :foreground "#8B8D8E"))))
`(gnus-splash ((,class (:foreground "#FF8C00"))))
`(gnus-summary-cancelled ((,class ,cancel)))
- `(gnus-summary-high-ancient ((,class (:weight normal :foreground "#808080" :background "#FFFFE6"))))
- `(gnus-summary-high-read ((,class (:weight normal :foreground "#999999" :background "#FFFFE6"))))
+ `(gnus-summary-high-ancient ((,class ,mail-unread-high)))
+ `(gnus-summary-high-read ((,class ,mail-read-high)))
`(gnus-summary-high-ticked ((,class ,mail-ticked)))
- `(gnus-summary-high-unread ((,class (:weight bold :foreground "black" :background "#FFFFCC"))))
- `(gnus-summary-low-ancient ((,class (:slant italic :foreground "gray55"))))
+ `(gnus-summary-high-unread ((,class ,mail-unread-high)))
+ `(gnus-summary-low-ancient ((,class (:slant italic :foreground "black"))))
`(gnus-summary-low-read ((,class (:slant italic :foreground "#999999" :background "#E0E0E0"))))
`(gnus-summary-low-ticked ((,class ,mail-ticked)))
`(gnus-summary-low-unread ((,class (:slant italic :foreground "black"))))
@@ -210,82 +275,105 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-summary-selected ((,class (:foreground "white" :background "#008CD7"))))
`(gnus-x-face ((,class (:foreground "black" :background "white"))))
- ;; Message faces
+ ;; Message faces.
`(message-header-name ((,class ,mail-header-name)))
`(message-header-cc ((,class ,mail-to)))
`(message-header-other ((,class ,mail-header-other)))
`(message-header-subject ((,class ,subject)))
`(message-header-to ((,class ,mail-to)))
- `(message-cited-text ((,class (:foreground "#5050B0"))))
+ `(message-cited-text ((,class (:foreground "#5050B0" :background "#F6F6F6"))))
`(message-separator ((,class (:family "Sans Serif" :weight normal :foreground "#BDC2C6"))))
`(message-header-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC"))))
`(message-header-xheader ((,class ,mail-header-other)))
`(message-mml ((,class (:foreground "forest green"))))
- ;; Diff
+ ;; Diff.
`(diff-added ((,class ,diff-added)))
`(diff-changed ((,class ,diff-changed)))
`(diff-context ((,class ,diff-none)))
`(diff-file-header ((,class ,diff-header)))
`(diff-file1-hunk-header ((,class (:foreground "dark magenta" :background "#EAF2F5"))))
`(diff-file2-hunk-header ((,class (:foreground "#2B7E2A" :background "#EAF2F5"))))
- `(diff-function ((,class (:foreground "darkgray"))))
+ `(diff-function ((,class (:foreground "#CC99CC"))))
`(diff-header ((,class ,diff-header)))
`(diff-hunk-header ((,class ,diff-hunk-header)))
`(diff-index ((,class ,diff-header)))
- `(diff-indicator-added ((,class (:background "#AAFFAA"))))
- `(diff-indicator-changed ((,class (:background "#8080FF"))))
- `(diff-indicator-removed ((,class (:background "#FFBBBB"))))
+ `(diff-indicator-added ((,class (:foreground "#3A993A" :background "#CDFFD8"))))
+ `(diff-indicator-changed ((,class (:background "#DBEDFF"))))
+ `(diff-indicator-removed ((,class (:foreground "#CC3333" :background "#FFDCE0"))))
+ `(diff-refine-added ((,class ,diff-refine-added)))
`(diff-refine-change ((,class (:background "#DDDDFF"))))
+ `(diff-refine-removed ((,class ,diff-refine-removed)))
`(diff-removed ((,class ,diff-removed)))
- ;; SMerge
+ ;; SMerge.
+ `(smerge-mine ((,class ,diff-changed)))
+ `(smerge-other ((,class ,diff-added)))
+ `(smerge-base ((,class ,diff-removed)))
+ `(smerge-markers ((,class (:background "#FFE5CC"))))
`(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-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.
+ `(ediff-current-diff-A ((,class (:background "#FFDDDD"))))
+ `(ediff-current-diff-B ((,class (:background "#DDFFDD"))))
+ `(ediff-current-diff-C ((,class (:background "cyan"))))
+ `(ediff-even-diff-A ((,class (:background "light grey"))))
+ `(ediff-even-diff-B ((,class (:background "light grey"))))
+ `(ediff-fine-diff-A ((,class (:background "#FFAAAA"))))
+ `(ediff-fine-diff-B ((,class (:background "#55FF55"))))
+ `(ediff-odd-diff-A ((,class (:background "light grey"))))
+ `(ediff-odd-diff-B ((,class (:background "light grey"))))
- ;; Flyspell
-;; (when (version< emacs-version "24.XXX")
- `(flyspell-duplicate ((,class (:underline "#008000" :inherit nil))))
- `(flyspell-incorrect ((,class (:underline "red" :inherit nil))))
-;; `(flyspell-duplicate ((,class (:underline (:style wave :color "#008000") :inherit nil))))
-;; `(flyspell-incorrect ((,class (:underline (:style wave :color "red") :inherit nil))))
+ ;; Flyspell.
+ (if (version< emacs-version "24.4")
+ `(flyspell-duplicate ((,class (:underline "#F4EB80" :inherit nil))))
+ `(flyspell-duplicate ((,class (:underline (:style wave :color "#F4EB80") :background "#FAF7CC" :inherit nil)))))
+ (if (version< emacs-version "24.4")
+ `(flyspell-incorrect ((,class (:underline "#FAA7A5" :inherit nil))))
+ `(flyspell-incorrect ((,class (:underline (:style wave :color "#FAA7A5") :background "#F4D7DA":inherit nil)))))
- ;; ;; Semantic faces
+ ;; ;; Semantic faces.
;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4))))
;; `(semantic-decoration-on-private-members-face ((,class (:background ,alum-2))))
;; `(semantic-decoration-on-protected-members-face ((,class (:background ,alum-2))))
- ;; `(semantic-decoration-on-unknown-includes ((,class (:background ,choc-3))))
+ `(semantic-decoration-on-unknown-includes ((,class (:background "#FFF8F8"))))
;; `(semantic-decoration-on-unparsed-includes ((,class (:underline ,orange-3))))
- ;; `(semantic-tag-boundary-face ((,class (:overline ,blue-1))))
+ `(semantic-highlight-func-current-tag-face ((,class ,highlight-current-tag)))
+ `(semantic-tag-boundary-face ((,class (:overline "#777777")))) ; Method separator.
;; `(semantic-unmatched-syntax-face ((,class (:underline ,red-1))))
`(Info-title-1-face ((,class ,ol1)))
`(Info-title-2-face ((,class ,ol2)))
`(Info-title-3-face ((,class ,ol3)))
`(Info-title-4-face ((,class ,ol4)))
- `(ac-completion-face ((,class (:underline nil :foreground "#C0C0C0")))) ; like Google
- `(ace-jump-face-foreground ((,class (:foreground "black" :background "#FBE448"))))
+ `(ace-jump-face-foreground ((,class (:weight bold :foreground "black" :background "#FEA500"))))
+ `(ahs-face ((,class (:background "#E4E4FF"))))
+ `(ahs-definition-face ((,class (:background "#FFB6C6"))))
+ `(ahs-plugin-defalt-face ((,class (:background "#FFE4FF")))) ; Current.
+ `(anzu-match-1 ((,class (:foreground "black" :background "aquamarine"))))
+ `(anzu-match-2 ((,class (:foreground "black" :background "springgreen"))))
+ `(anzu-match-3 ((,class (:foreground "black" :background "red"))))
+ `(anzu-mode-line ((,class (:foreground "black" :background "#80FF80"))))
+ `(anzu-mode-line-no-match ((,class (:foreground "black" :background "#FF8080"))))
+ `(anzu-replace-highlight ((,class (:inherit query-replace))))
+ `(anzu-replace-to ((,class (:weight bold :foreground "#BD33FD" :background "#FDBD33"))))
`(auto-dim-other-buffers-face ((,class (:background "#F7F7F7"))))
+ `(avy-background-face ((,class (:background "#A9A9A9"))))
+ `(avy-lead-face ((,class (:weight bold :foreground "black" :background "#FEA500"))))
`(bbdb-company ((,class (:slant italic :foreground "steel blue"))))
`(bbdb-field-name ((,class (:weight bold :foreground "steel blue"))))
`(bbdb-field-value ((,class (:foreground "steel blue"))))
`(bbdb-name ((,class (:underline t :foreground "#FF6633"))))
- `(bmkp-light-autonamed ((,class (:background "#C2DDFD"))))
- `(bmkp-light-fringe-autonamed ((,class (:background "#90AFD5"))))
- `(bmkp-light-fringe-non-autonamed ((,class (:background "#D5FFD5"))))
- `(bmkp-light-non-autonamed ((,class (:background "#C4FFC4"))))
- `(browse-kill-ring-separator-face ((,class (:weight bold :foreground "slate gray"))))
+ `(bmkp-light-autonamed ((,class (:background "#F0F0F0"))))
+ `(bmkp-light-fringe-autonamed ((,class (:foreground "#5A5A5A" :background "#D4D4D4"))))
+ `(bmkp-light-fringe-non-autonamed ((,class (:foreground "#FFFFCC" :background "#01FFFB")))) ; default
+ `(bmkp-light-non-autonamed ((,class (:background "#BFFFFE"))))
+ `(bmkp-no-local ((,class (:background "pink"))))
+ `(browse-kill-ring-separator-face ((,class (:foreground "red"))))
+ `(calendar-month-header ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
`(calendar-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(calendar-weekday-header ((,class (:weight bold :foreground "#1662AF"))))
+ `(calendar-weekend-header ((,class (:weight bold :foreground "#4E4E4E"))))
`(cfw:face-annotation ((,class (:foreground "green" :background "red"))))
`(cfw:face-day-title ((,class (:foreground "#C9C9C9"))))
`(cfw:face-default-content ((,class (:foreground "#2952A3"))))
@@ -300,12 +388,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(cfw:face-sunday ((,class (:foreground "#4E4E4E" :background "white" :weight bold))))
`(cfw:face-title ((,class (:height 2.0 :foreground "#676767" :weight bold :inherit variable-pitch))))
`(cfw:face-today ((,class (:foreground "#4F4A3D" :background "#FFFFCC"))))
- `(cfw:face-today-title ((,class (:foreground "#4A95EB" :background "#FFFFCC"))))
+ `(cfw:face-today-title ((,class (:foreground "white" :background "#1766B1"))))
`(cfw:face-toolbar ((,class (:background "white"))))
`(cfw:face-toolbar-button-off ((,class (:foreground "#CFCFCF" :background "white"))))
`(cfw:face-toolbar-button-on ((,class (:foreground "#5E5E5E" :background "#F6F6F6"))))
- `(change-log-date-face ((,class (:foreground "purple"))))
+ `(change-log-date ((,class (:foreground "purple"))))
`(change-log-file ((,class (:weight bold :foreground "#4183C4"))))
+ `(change-log-list ((,class (:foreground "black" :background "#75EEC7"))))
+ `(change-log-name ((,class (:foreground "#008000"))))
`(circe-highlight-all-nicks-face ((,class (:foreground "blue" :background "#F0F0F0")))) ; other nick names
`(circe-highlight-nick-face ((,class (:foreground "#009300" :background "#F0F0F0")))) ; messages with my nick cited
`(circe-my-message-face ((,class (:foreground "#8B8B8B" :background "#F0F0F0"))))
@@ -315,15 +405,38 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(comint-highlight-input ((,class (:weight bold :foreground "#0000FF" :inherit nil))))
;; `(comint-highlight-prompt ((,class (:weight bold :foreground "black" :background "gold"))))
`(comint-highlight-prompt ((,class (:weight bold :foreground "#0000FF" :inherit nil))))
- `(company-preview-common ((,class (:foreground "#C0C0C0" :background "#FFFFD7")))) ; same background as highlight-line
- `(company-tooltip-annotation ((,class (:foreground "#999999" :background "cornsilk"))))
- `(company-tooltip-common ((,class (:weight bold :inherit company-tooltip))))
- `(company-tooltip-common-selection ((,class (:weight bold :inherit company-tooltip-selection))))
+
+ ;; `(ac-selection-face ((,class ,completion-selected-candidate)))
+ `(ac-selection-face ((,class (:weight bold :foreground "white" :background "orange")))) ; TEMP For diff'ing AC from Comp.
+ `(ac-candidate-face ((,class ,completion-other-candidates)))
+ `(ac-completion-face ((,class ,completion-inline)))
+ `(ac-candidate-mouse-face ((,class (:inherit highlight))))
+ `(popup-scroll-bar-background-face ((,class (:background "#EBF4FE"))))
+ `(popup-scroll-bar-foreground-face ((,class (:background "#D1DAE4")))) ; Scrollbar (visible).
+
+ `(company-tooltip-common-selection ((,class (:weight normal :foreground "#F9ECCC" :inherit company-tooltip-selection)))) ; Prefix + common part in tooltip (for selection).
+ `(company-tooltip-selection ((,class ,completion-selected-candidate))) ; Suffix in tooltip (for selection).
+ `(company-tooltip-annotation-selection ((,class (:weight normal :foreground "#F9ECCC")))) ; Annotation (for selection).
+
+ `(company-tooltip-common ((,class (:weight normal :foreground "#B000B0" :inherit company-tooltip)))) ; Prefix + common part in tooltip.
+ `(company-tooltip ((,class ,completion-other-candidates))) ; Suffix in tooltip.
+ `(company-tooltip-annotation ((,class (:weight normal :foreground "#2415FF")))) ; Annotation.
+
+ `(company-preview-common ((,class ,completion-inline)))
+
+ `(company-scrollbar-bg ((,class (:background "#EBF4FE"))))
+ `(company-scrollbar-fg ((,class (:background "#D1DAE4")))) ; Scrollbar (visible).
+
`(compare-windows ((,class (:background "#FFFF00"))))
- `(compilation-error ((,class (:weight bold :foreground "red"))))
- `(compilation-info ((,class (:weight bold :foreground "#2A489E")))) ; used for grep
- `(compilation-line-number ((,class (:weight bold :foreground "#A535AE"))))
+ ;; `(completions-common-part ((,class (:foreground "red" :weight bold))))
+ ;; `(completions-first-difference ((,class (:foreground "green" :weight bold))))
+ `(compilation-error ((,class (:weight bold :foreground "red")))) ; Used for grep error messages.
+ `(compilation-info ((,class (:weight bold :foreground "#6784d7"))))
+ `(compilation-line-number ((,class ,grep-line-number)))
`(compilation-warning ((,class (:weight bold :foreground "orange"))))
+ `(compilation-mode-line-exit ((,class (:weight bold :foreground "green")))) ; :exit[matched]
+ `(compilation-mode-line-fail ((,class (:weight bold :foreground "violet")))) ; :exit[no match]
+ `(compilation-mode-line-run ((,class (:weight bold :foreground "orange")))) ; :run
`(css-property ((,class (:foreground "#00AA00"))))
`(css-selector ((,class (:weight bold :foreground "blue"))))
`(custom-button ((,class (:box (:line-width 2 :style released-button) :foreground "black" :background "lightgrey"))))
@@ -349,11 +462,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(custom-variable-button ((,class (:weight bold :underline t))))
`(custom-variable-tag ((,class (:family "Sans Serif" :height 1.2 :weight bold :foreground "blue1"))))
`(custom-visibility ((,class ,link)))
- `(diff-hl-change ((,class (:foreground "blue3" :inherit diff-changed))))
- `(diff-hl-delete ((,class (:foreground "red3" :inherit diff-removed))))
- `(diff-hl-dired-change ((,class (:background "#FFA335" :foreground "black" :weight bold))))
+ `(diff-hl-change ((,class (:foreground "blue3" :background "#DBEDFF"))))
+ `(diff-hl-delete ((,class (:foreground "red3" :background "#FFDCE0"))))
+ `(diff-hl-dired-change ((,class (:weight bold :foreground "black" :background "#FFA335"))))
+ `(diff-hl-dired-delete ((,class (:weight bold :foreground "#D73915"))))
+ `(diff-hl-dired-ignored ((,class (:weight bold :foreground "white" :background "#C0BBAB"))))
+ `(diff-hl-dired-insert ((,class (:weight bold :foreground "#B9B9BA"))))
`(diff-hl-dired-unknown ((,class (:foreground "white" :background "#3F3BB4"))))
- `(diff-hl-insert ((,class (:foreground "green4" :inherit diff-added))))
+ `(diff-hl-insert ((,class (:foreground "green4" :background "#CDFFD8"))))
`(diff-hl-unknown ((,class (:foreground "white" :background "#3F3BB4"))))
`(diary-face ((,class (:foreground "#87C9FC"))))
`(dircolors-face-asm ((,class (:foreground "black"))))
@@ -386,17 +502,36 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(diredp-compressed-file-suffix ((,class (:foreground "red"))))
`(diredp-date-time ((,class (:foreground "purple"))))
`(diredp-dir-heading ((,class ,directory)))
+ `(diredp-dir-name ((,class ,directory)))
`(diredp-dir-priv ((,class ,directory)))
`(diredp-exec-priv ((,class (:background "#03C03C"))))
`(diredp-executable-tag ((,class (:foreground "ForestGreen" :background "white"))))
- `(diredp-file-name ((,class (:foreground "black"))))
+ `(diredp-file-name ((,class ,file)))
`(diredp-file-suffix ((,class (:foreground "#C0C0C0"))))
`(diredp-flag-mark-line ((,class ,marked-line)))
`(diredp-ignored-file-name ((,class ,shadow)))
`(diredp-read-priv ((,class (:background "#0A99FF"))))
`(diredp-write-priv ((,class (:foreground "white" :background "#FF4040"))))
+ `(eldoc-highlight-function-argument ((,class (:weight bold :foreground "red" :background "#FFE4FF"))))
+ `(elfeed-search-filter-face ((,class (:foreground "gray"))))
+ ;; `(eww-form-checkbox ((,class ())))
+ ;; `(eww-form-select ((,class ())))
+ ;; `(eww-form-submit ((,class ())))
+ `(eww-form-text ((,class (:weight bold :foreground "#40586F" :background "#A7CDF1"))))
+ ;; `(eww-form-textarea ((,class ())))
`(file-name-shadow ((,class ,shadow)))
+ `(flycheck-error ((,class (:underline (:color "#FE251E" :style wave) :weight bold :background "#FFE1E1"))))
+ `(flycheck-error-list-line-number ((,class (:foreground "#A535AE"))))
+ `(flycheck-fringe-error ((,class (:foreground "#FE251E"))))
+ `(flycheck-fringe-info ((,class (:foreground "#158A15"))))
+ `(flycheck-fringe-warning ((,class (:foreground "#F4A939"))))
+ `(flycheck-info ((,class (:underline (:color "#158A15" :style wave) :weight bold))))
+ `(flycheck-warning ((,class (:underline (:color "#F4A939" :style wave) :weight bold :background "#FFFFBE"))))
`(font-latex-bold-face ((,class (:weight bold :foreground "black"))))
+ `(fancy-narrow-blocked-face ((,class (:foreground "#9998A4"))))
+ `(flycheck-color-mode-line-error-face ((, class (:background "#CF5B56"))))
+ `(flycheck-color-mode-line-warning-face ((, class (:background "#EBC700"))))
+ `(flycheck-color-mode-line-info-face ((, class (:background "yellow"))))
`(font-latex-italic-face ((,class (:slant italic :foreground "#1A1A1A"))))
`(font-latex-math-face ((,class (:foreground "blue"))))
`(font-latex-sectioning-1-face ((,class (:family "Sans Serif" :height 2.7 :weight bold :foreground "cornflower blue"))))
@@ -409,36 +544,65 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(font-latex-verbatim-face ((,class (:foreground "#000088" :background "#FFFFE0" :inherit nil))))
`(git-commit-summary-face ((,class (:foreground "#000000"))))
`(git-commit-comment-face ((,class (:slant italic :foreground "#696969"))))
+ `(git-timemachine-commit ((,class ,diff-removed)))
+ `(git-timemachine-minibuffer-author-face ((,class ,diff-added)))
+ `(git-timemachine-minibuffer-detail-face ((,class ,diff-header)))
+ `(google-translate-text-face ((,class (:foreground "#777777" :background "#F5F5F5"))))
+ `(google-translate-phonetic-face ((,class (:inherit shadow))))
+ `(google-translate-translation-face ((,class (:weight normal :foreground "#3079ED" :background "#E3EAF2"))))
+ `(google-translate-suggestion-label-face ((,class (:foreground "red"))))
+ `(google-translate-suggestion-face ((,class (:slant italic :underline t))))
+ `(google-translate-listen-button-face ((,class (:height 0.8))))
`(helm-action ((,class (:foreground "black"))))
+ `(helm-bookmark-file ((,class ,file)))
`(helm-bookmarks-su-face ((,class (:foreground "red"))))
+ `(helm-buffer-directory ((,class ,directory)))
+ ;; `(helm-non-file-buffer ((,class (:slant italic :foreground "blue"))))
+ ;; `(helm-buffer-file ((,class (:foreground "#333333"))))
+ `(helm-buffer-modified ((,class (:slant italic :foreground "#BA36A5"))))
`(helm-buffer-process ((,class (:foreground "#008200"))))
`(helm-candidate-number ((,class (:foreground "black" :background "#FFFF66"))))
`(helm-dir-heading ((,class (:foreground "blue" :background "pink"))))
`(helm-dir-priv ((,class (:foreground "dark red" :background "light grey"))))
`(helm-ff-directory ((,class ,directory)))
+ `(helm-ff-dotted-directory ((,class ,directory)))
`(helm-ff-executable ((,class (:foreground "green3" :background "white"))))
`(helm-ff-file ((,class (:foreground "black"))))
`(helm-ff-invalid-symlink ((,class (:foreground "yellow" :background "red"))))
`(helm-ff-symlink ((,class ,symlink)))
`(helm-file-name ((,class (:foreground "blue"))))
`(helm-gentoo-match-face ((,class (:foreground "red"))))
+ `(helm-grep-file ((,class ,grep-file-name)))
+ `(helm-grep-lineno ((,class ,grep-line-number)))
`(helm-grep-match ((,class ,match)))
`(helm-grep-running ((,class (:weight bold :foreground "white"))))
- `(helm-grep-lineno ((,class ,shadow)))
`(helm-isearch-match ((,class (:background "#CCFFCC"))))
+ `(helm-lisp-show-completion ((,class ,volatile-highlight-supersize))) ; See `helm-dabbrev'.
+ ;; `(helm-ls-git-added-copied-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-added-modified-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-conflict-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-deleted-and-staged-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-deleted-not-staged-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-modified-and-staged-face ((,class (:foreground ""))))
+ `(helm-ls-git-modified-not-staged-face ((,class (:foreground "#BA36A5"))))
+ ;; `(helm-ls-git-renamed-modified-face ((,class (:foreground ""))))
+ ;; `(helm-ls-git-untracked-face ((,class (:foreground ""))))
`(helm-match ((,class ,match)))
`(helm-moccur-buffer ((,class (:foreground "#0066CC"))))
- `(helm-selection ((,class ,volatile-highlight)))
- `(helm-selection-line ((,class ,volatile-highlight)))
- `(helm-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#2F69BF"))))
- `(helm-swoop-target-line-face ((,class ,volatile-highlight)))
+ `(helm-selection ((,class (:background "#3875D6" :foreground "white"))))
+ `(helm-selection-line ((,class ,highlight-gray))) ; ???
+ `(helm-separator ((,class (:foreground "red"))))
+ `(helm-source-header ((,class (:weight bold :box (:line-width 1 :color "#C7C7C7") :background "#DEDEDE" :foreground "black"))))
`(helm-swoop-target-line-block-face ((,class (:background "#CCCC00" :foreground "#222222"))))
+ `(helm-swoop-target-line-face ((,class (:background "#CCCCFF"))))
`(helm-swoop-target-word-face ((,class (:weight bold :foreground nil :background "#FDBD33"))))
`(helm-visible-mark ((,class ,marked-line)))
`(helm-w3m-bookmarks-face ((,class (:underline t :foreground "cyan1"))))
+ `(highlight-changes ((,class (:foreground nil)))) ;; blue "#2E08B5"
+ `(highlight-changes-delete ((,class (:strike-through nil :foreground nil)))) ;; red "#B5082E"
`(highlight-symbol-face ((,class (:background "#FFFFA0"))))
- `(hl-line ((,class ,highlight-line)))
- `(hl-tags-face ((,class (:background "#FEFCAE"))))
+ `(hl-line ((,class ,highlight-yellow))) ; Highlight current line.
+ `(hl-tags-face ((,class ,highlight-current-tag))) ; ~ Pair highlighting (matching tags).
`(holiday-face ((,class (:foreground "#777777" :background "#E4EBFE"))))
`(html-helper-bold-face ((,class (:weight bold :foreground "black"))))
`(html-helper-italic-face ((,class (:slant italic :foreground "black"))))
@@ -449,9 +613,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(ilog-echo-face ((,class (:height 2.0 :foreground "#006FE0"))))
`(ilog-load-face ((,class (:foreground "#BA36A5"))))
`(ilog-message-face ((,class (:foreground "#808080"))))
+ `(indent-guide-face ((,class (:foreground "#D3D3D3"))))
`(info-file ((,class (:family "Sans Serif" :height 1.8 :weight bold :box (:line-width 1 :color "#0000CC") :foreground "cornflower blue" :background "LightSteelBlue1"))))
`(info-header-node ((,class (:underline t :foreground "orange")))) ; nodes in header
`(info-header-xref ((,class (:underline t :foreground "dodger blue")))) ; cross references in header
+ `(info-index-match ((,class (:weight bold :foreground nil :background "#FDBD33")))) ; when using `i'
`(info-menu-header ((,class ,ol2))) ; menu titles (headers) -- major topics
`(info-menu-star ((,class (:foreground "black")))) ; every 3rd menu item
`(info-node ((,class (:underline t :foreground "blue")))) ; node names
@@ -460,16 +626,49 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(info-title-1 ((,class ,ol1)))
`(info-xref ((,class (:underline t :foreground "#006DAF")))) ; unvisited cross-references
`(info-xref-visited ((,class (:underline t :foreground "magenta4")))) ; previously visited cross-references
+ ;; js2-highlight-vars-face (~ auto-highlight-symbol)
+ `(js2-error ((,class (:box (:line-width 1 :color "#FF3737") :background "#FFC8C8")))) ; DONE.
+ `(js2-external-variable ((,class (:foreground "#FF0000" :background "#FFF8F8")))) ; DONE.
+ `(js2-function-param ((,class ,function-param)))
+ `(js2-instance-member ((,class (:foreground "DarkOrchid"))))
+ `(js2-jsdoc-html-tag-delimiter ((,class (:foreground "#D0372D"))))
+ `(js2-jsdoc-html-tag-name ((,class (:foreground "#D0372D"))))
+ `(js2-jsdoc-tag ((,class (:weight normal :foreground "#6434A3"))))
+ `(js2-jsdoc-type ((,class (:foreground "SteelBlue"))))
+ `(js2-jsdoc-value ((,class (:weight normal :foreground "#BA36A5")))) ; #800080
+ `(js2-magic-paren ((,class (:underline t))))
+ `(js2-private-function-call ((,class (:foreground "goldenrod"))))
+ `(js2-private-member ((,class (:foreground "PeachPuff3"))))
+ `(js2-warning ((,class (:underline "orange"))))
+
+ ;; Org non-standard faces.
+ `(leuven-org-deadline-overdue ((,class (:foreground "#F22659"))))
+ `(leuven-org-deadline-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(leuven-org-deadline-tomorrow ((,class (:foreground "#40A80B"))))
+ `(leuven-org-deadline-future ((,class (:foreground "#40A80B"))))
+ `(leuven-gnus-unseen ((,class (:weight bold :foreground "#FC7202"))))
+ `(leuven-gnus-date ((,class (:foreground "#FF80BF"))))
+ `(leuven-gnus-size ((,class (:foreground "#8FBF60"))))
+ `(leuven-todo-items-face ((,class (:weight bold :foreground "#FF3125" :background "#FFFF88"))))
+
`(light-symbol-face ((,class (:background "#FFFFA0"))))
- `(linum ((,class (:inherit (default shadow) :foreground "#9A9A9A" :background "#EDEDED"))))
+ `(linum ((,class (:foreground "#9A9A9A" :background "#EDEDED"))))
`(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
+ `(log-view-message ((,class (:foreground "black" :background "#EDEA74"))))
+ `(lsp-ui-doc-background ((,class (:background "#F6FECD"))))
`(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"))))
+ `(magit-blame-header ((,class (:inherit magit-diff-file-header))))
+ `(magit-blame-heading ((,class (:overline "#A7A7A7" :foreground "red" :background "#E6E6E6"))))
+ `(magit-blame-hash ((,class (:overline "#A7A7A7" :foreground "red" :background "#E6E6E6"))))
+ `(magit-blame-name ((,class (:overline "#A7A7A7" :foreground "#036A07" :background "#E6E6E6"))))
+ `(magit-blame-date ((,class (:overline "#A7A7A7" :foreground "blue" :background "#E6E6E6"))))
+ `(magit-blame-summary ((,class (:overline "#A7A7A7" :weight bold :foreground "#707070" :background "#E6E6E6"))))
`(magit-branch ((,class ,vc-branch)))
`(magit-diff-add ((,class ,diff-added)))
`(magit-diff-del ((,class ,diff-removed)))
- `(magit-diff-file-header ((,class (:family "Sans Serif" :height 1.1 :weight bold :foreground "#4183C4"))))
+ `(magit-diff-file-header ((,class (:height 1.1 :weight bold :foreground "#4183C4"))))
`(magit-diff-hunk-header ((,class ,diff-hunk-header)))
`(magit-diff-none ((,class ,diff-none)))
`(magit-header ((,class (:foreground "white" :background "#FF4040"))))
@@ -477,48 +676,82 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(magit-item-mark ((,class ,marked-line)))
`(magit-log-head-label ((,class (:box (:line-width 1 :color "blue" :style nil)))))
`(magit-log-tag-label ((,class (:box (:line-width 1 :color "#00CC00" :style nil)))))
+ `(magit-section-highlight ((,class (:background "#F6FECD"))))
`(magit-section-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "cornflower blue" :inherit nil))))
`(makefile-space-face ((,class (:background "hot pink"))))
`(makefile-targets ((,class (:weight bold :foreground "blue"))))
- `(match ((,class ,match)))
+ ;; `(markdown-blockquote-face ((,class ())))
+ `(markdown-bold-face ((,class (:inherit bold))))
+ ;; `(markdown-comment-face ((,class ())))
+ ;; `(markdown-footnote-face ((,class ())))
+ ;; `(markdown-header-delimiter-face ((,class ())))
+ ;; `(markdown-header-face ((,class ())))
+ `(markdown-header-face-1 ((,class ,ol1)))
+ `(markdown-header-face-2 ((,class ,ol2)))
+ `(markdown-header-face-3 ((,class ,ol3)))
+ `(markdown-header-face-4 ((,class ,ol4)))
+ `(markdown-header-face-5 ((,class ,ol5)))
+ `(markdown-header-face-6 ((,class ,ol6)))
+ ;; `(markdown-header-rule-face ((,class ())))
+ `(markdown-inline-code-face ((,class ,code-inline)))
+ `(markdown-italic-face ((,class (:inherit italic))))
+ `(markdown-language-keyword-face ((,class (:inherit org-block-begin-line))))
+ ;; `(markdown-line-break-face ((,class ())))
+ `(markdown-link-face ((,class ,link-no-underline)))
+ ;; `(markdown-link-title-face ((,class ())))
+ ;; `(markdown-list-face ((,class ())))
+ ;; `(markdown-math-face ((,class ())))
+ ;; `(markdown-metadata-key-face ((,class ())))
+ ;; `(markdown-metadata-value-face ((,class ())))
+ ;; `(markdown-missing-link-face ((,class ())))
+ `(markdown-pre-face ((,class (:inherit org-block-background))))
+ ;; `(markdown-reference-face ((,class ())))
+ ;; `(markdown-strike-through-face ((,class ())))
+ `(markdown-url-face ((,class ,link)))
+ `(match ((,class ,match))) ; Used for grep matches.
+ `(mc/cursor-bar-face ((,class (:height 1.0 :foreground "#1664C4" :background "#1664C4"))))
+ `(mc/cursor-face ((,class (:inverse-video t))))
+ `(mc/region-face ((,class (:inherit region))))
`(mm-uu-extract ((,class ,code-block)))
`(moccur-current-line-face ((,class (:foreground "black" :background "#FFFFCC"))))
`(moccur-face ((,class (:foreground "black" :background "#FFFF99"))))
- `(next-error ((,class ,volatile-highlight)))
+ `(next-error ((,class ,volatile-highlight-supersize)))
`(nobreak-space ((,class (:background "#CCE8F6"))))
- `(nxml-attribute-local-name-face ((,class (:foreground "magenta"))))
+ `(nxml-attribute-local-name-face ((,class ,xml-attribute)))
`(nxml-attribute-value-delimiter-face ((,class (:foreground "green4"))))
`(nxml-attribute-value-face ((,class (:foreground "green4"))))
`(nxml-comment-content-face ((,class (:slant italic :foreground "red"))))
`(nxml-comment-delimiter-face ((,class (:foreground "red"))))
- `(nxml-element-local-name ((,class (:box (:line-width 1 :color "#999999") :foreground "#000088" :background "#DEDEDE"))))
+ `(nxml-element-local-name ((,class ,xml-tag)))
`(nxml-element-local-name-face ((,class (:foreground "blue"))))
`(nxml-processing-instruction-target-face ((,class (:foreground "purple1"))))
`(nxml-tag-delimiter-face ((,class (:foreground "blue"))))
`(nxml-tag-slash-face ((,class (:foreground "blue"))))
`(org-agenda-block-count ((,class (:weight bold :foreground "#A5A5A5"))))
- `(org-agenda-calendar-event ((,class (:weight bold :foreground "#3774CC" :background "#A8C5EF"))))
- `(org-agenda-calendar-sexp ((,class (:foreground "#777777" :background "#E4EBFE"))))
+ `(org-agenda-calendar-event ((,class (:weight bold :foreground "#3774CC" :background "#E4EBFE"))))
+ `(org-agenda-calendar-sexp ((,class (:foreground "#327ACD" :background "#F3F7FC"))))
`(org-agenda-clocking ((,class (:foreground "black" :background "#EEC900"))))
`(org-agenda-column-dateline ((,class ,column)))
`(org-agenda-current-time ((,class (:underline t :foreground "#1662AF"))))
- `(org-agenda-date ((,class (:height 1.6 :weight bold :foreground "#1662AF"))))
- `(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
- `(org-agenda-date-weekend ((,class (:height 1.6 :weight bold :foreground "#4E4E4E"))))
+ `(org-agenda-date ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#1662AF"))))
+ `(org-agenda-date-today ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
+ `(org-agenda-date-weekend ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#4E4E4E"))))
`(org-agenda-diary ((,class (:weight bold :foreground "green4" :background "light blue"))))
`(org-agenda-dimmed-todo-face ((,class (:foreground "gold2"))))
`(org-agenda-done ((,class (:foreground "#555555"))))
`(org-agenda-filter-category ((,class (:weight bold :foreground "orange"))))
+ `(org-agenda-filter-effort ((,class (:weight bold :foreground "orange"))))
+ `(org-agenda-filter-regexp ((,class (:weight bold :foreground "orange"))))
`(org-agenda-filter-tags ((,class (:weight bold :foreground "orange"))))
`(org-agenda-restriction-lock ((,class (:background "#E77D63"))))
- `(org-agenda-structure ((,class (:height 1.6 :weight bold :foreground "#1F8DD6"))))
+ `(org-agenda-structure ((,class (,@(leuven-scale-font leuven-scale-org-agenda-structure 1.6) :weight bold :foreground "#1F8DD6"))))
`(org-archived ((,class (:foreground "gray70"))))
`(org-beamer-tag ((,class (:box (:line-width 1 :color "#FABC18") :foreground "#2C2C2C" :background "#FFF8D0"))))
`(org-block ((,class ,code-block)))
- `(org-block-background ((,class (:background "#FFFFE0"))))
+ `(org-block-background ((,class (:background "#FFFFE0")))) ;; :inherit fixed-pitch))))
`(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
`(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
- `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "white" :background "#777777"))))
+ `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "#123555" :background "#A3A3A3"))))
`(org-clock-overlay ((,class (:foreground "white" :background "SkyBlue4"))))
`(org-code ((,class ,code-inline)))
`(org-column ((,class ,column)))
@@ -528,14 +761,14 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(org-dim ((,class (:foreground "#AAAAAA"))))
`(org-document-info ((,class (:foreground "#484848"))))
`(org-document-info-keyword ((,class (:foreground "#008ED1" :background "#EAEAFF"))))
- `(org-document-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "black"))))
+ `(org-document-title ((,class (:height 1.8 :weight bold :foreground "black"))))
`(org-done ((,class (:weight bold :box (:line-width 1 :color "#BBBBBB") :foreground "#BBBBBB" :background "#F0F0F0"))))
- `(org-drawer ((,class (:foreground "light sky blue"))))
- `(org-ellipsis ((,class (:underline nil :box (:line-width 1 :color "#999999") :foreground "#999999" :background "#FFF8C0")))) ; #FFEE62
+ `(org-drawer ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA" :extend nil))))
+ `(org-ellipsis ((,class (:underline nil :foreground "#999999")))) ; #FFEE62
`(org-example ((,class (:foreground "blue" :background "#EAFFEA"))))
`(org-footnote ((,class (:underline t :foreground "#008ED1"))))
`(org-formula ((,class (:foreground "chocolate1"))))
- `(org-headline-done ((,class (:height 1.0 :weight normal :strike-through t :foreground "#ADADAD"))))
+ `(org-headline-done ((,class (:height 1.0 :weight normal :foreground "#ADADAD"))))
`(org-hide ((,class (:foreground "#E2E2E2"))))
`(org-inlinetask ((,class (:box (:line-width 1 :color "#EBEBEB") :foreground "#777777" :background "#FFFFD6"))))
`(org-latex-and-related ((,class (:foreground "#336699" :background "white"))))
@@ -549,25 +782,25 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(org-level-8 ((,class ,ol8)))
`(org-link ((,class ,link)))
`(org-list-dt ((,class (:weight bold :foreground "#335EA8"))))
- `(org-macro ((,class (:foreground "white" :background "#EDB802"))))
+ `(org-macro ((,class (:weight bold :foreground "#EDB802"))))
`(org-meta-line ((,class (:slant normal :foreground "#008ED1" :background "#EAEAFF"))))
- `(org-mode-line-clock ((,class ,clock-line)))
+ `(org-mode-line-clock ((,class (:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#FFA335"))))
`(org-mode-line-clock-overrun ((,class (:weight bold :box (:line-width 1 :color "#335EA8") :foreground "white" :background "#FF4040"))))
`(org-number-of-items ((,class (:weight bold :foreground "white" :background "#79BA79"))))
`(org-property-value ((,class (:foreground "#00A000"))))
`(org-quote ((,class (:slant italic :foreground "dim gray" :background "#FFFFE0"))))
`(org-scheduled ((,class (:foreground "#333333"))))
- `(org-scheduled-previously ((,class (:foreground "#F22659"))))
+ `(org-scheduled-previously ((,class (:foreground "#1466C6"))))
`(org-scheduled-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC"))))
`(org-sexp-date ((,class (:foreground "#3774CC"))))
`(org-special-keyword ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA"))))
- `(org-table ((,class (:foreground "dark green" :background "#EAFFEA"))))
+ `(org-table ((,class (:foreground "dark green" :background "#EAFFEA")))) ;; :inherit fixed-pitch))))
`(org-tag ((,class (:weight normal :slant italic :foreground "#9A9FA4" :background "white"))))
- `(org-target ((,class ,link)))
+ `(org-target ((,class (:foreground "#FF6DAF"))))
`(org-time-grid ((,class (:foreground "#CFCFCF"))))
`(org-todo ((,class (:weight bold :box (:line-width 1 :color "#D8ABA7") :foreground "#D8ABA7" :background "#FFE6E4"))))
`(org-upcoming-deadline ((,class (:foreground "#FF5555"))))
- `(org-verbatim ((,class (:foreground "#0066CC"))))
+ `(org-verbatim ((,class (:foreground "#0066CC" :background "#F7FDFF"))))
`(org-verse ((,class (:slant italic :foreground "dim gray" :background "#EEEEEE"))))
`(org-warning ((,class (:weight bold :foreground "black" :background "#CCE7FF"))))
`(outline-1 ((,class ,ol1)))
@@ -578,17 +811,17 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(outline-6 ((,class ,ol6)))
`(outline-7 ((,class ,ol7)))
`(outline-8 ((,class ,ol8)))
- `(pabbrev-debug-display-label-face ((,class (:background "chartreuse"))))
+ `(pabbrev-debug-display-label-face ((,class (:foreground "white" :background "#A62154"))))
`(pabbrev-suggestions-face ((,class (:weight bold :foreground "white" :background "red"))))
`(pabbrev-suggestions-label-face ((,class (:weight bold :foreground "white" :background "purple"))))
`(paren-face-match ((,class ,paren-matched)))
`(paren-face-mismatch ((,class ,paren-unmatched)))
`(paren-face-no-match ((,class ,paren-unmatched)))
`(persp-selected-face ((,class (:weight bold :foreground "#EEF5FE"))))
- `(powerline-active1 ((,class (:background "grey22" :inherit mode-line))))
- `(powerline-active2 ((,class (:background "#4070B6" :inherit mode-line))))
- `(powerline-inactive1 ((,class (:background "#686868" :inherit mode-line-inactive))))
- `(powerline-inactive2 ((,class (:background "#A9A9A9" :inherit mode-line-inactive))))
+ `(powerline-active1 ((,class (:foreground "#85CEEB" :background "#383838" :inherit mode-line))))
+ `(powerline-active2 ((,class (:foreground "#85CEEB" :background "#4070B6" :inherit mode-line))))
+ `(powerline-inactive1 ((,class (:foreground "#F0F0EF" :background "#686868" :inherit mode-line-inactive))))
+ `(powerline-inactive2 ((,class (:foreground "#F0F0EF" :background "#A9A9A9" :inherit mode-line-inactive))))
`(rainbow-delimiters-depth-1-face ((,class (:foreground "#707183"))))
`(rainbow-delimiters-depth-2-face ((,class (:foreground "#7388D6"))))
`(rainbow-delimiters-depth-3-face ((,class (:foreground "#909183"))))
@@ -600,29 +833,33 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(rainbow-delimiters-depth-9-face ((,class (:foreground "#887070"))))
`(rainbow-delimiters-mismatched-face ((,class ,paren-unmatched)))
`(rainbow-delimiters-unmatched-face ((,class ,paren-unmatched)))
- `(realgud-overlay-arrow1 ((,class (:foreground "#005522"))))
- `(realgud-overlay-arrow2 ((,class (:foreground "#c18401"))))
- `(realgud-overlay-arrow3 ((,class (:foreground "#909183"))))
- `(realgud-bp-disabled-face ((,class (:foreground "#909183"))))
- `(realgud-bp-line-enabled-face ((,class (:underline "red"))))
- `(realgud-bp-line-disabled-face ((,class (:underline "#909183"))))
- `(realgud-file-name ((,class :foreground "#005522")))
- `(realgud-line-number ((,class :foreground "#A535AE")))
- `(realgud-backtrace-number ((,class :foreground "#A535AE" :weight bold)))
`(recover-this-file ((,class (:weight bold :background "#FF3F3F"))))
`(rng-error ((,class (:weight bold :foreground "red" :background "#FBE3E4"))))
`(sh-heredoc ((,class (:foreground "blue" :background "#EEF5FE"))))
`(sh-quoted-exec ((,class (:foreground "#FF1493"))))
- `(shadow ((,class ,shadow)))
+ `(shadow ((,class ,shadow))) ; Used for grep context lines.
`(shell-option-face ((,class (:foreground "forest green"))))
`(shell-output-2-face ((,class (:foreground "blue"))))
`(shell-output-3-face ((,class (:foreground "purple"))))
`(shell-output-face ((,class (:foreground "black"))))
;; `(shell-prompt-face ((,class (:weight bold :foreground "yellow"))))
+ `(shm-current-face ((,class (:background "#EEE8D5"))))
+ `(shm-quarantine-face ((,class (:background "lemonchiffon"))))
`(show-paren-match ((,class ,paren-matched)))
`(show-paren-mismatch ((,class ,paren-unmatched)))
`(sml-modeline-end-face ((,class (:background "#6BADF6")))) ; #335EA8
`(sml-modeline-vis-face ((,class (:background "#1979CA"))))
+ `(term ((,class (:foreground "#333333" :background "#FFFFFF"))))
+
+ ;; `(sp-pair-overlay-face ((,class ())))
+ ;; `(sp-show-pair-enclosing ((,class ())))
+ ;; `(sp-show-pair-match-face ((,class ()))) ; ~ Pair highlighting (matching tags).
+ ;; `(sp-show-pair-mismatch-face ((,class ())))
+ ;; `(sp-wrap-overlay-closing-pair ((,class ())))
+ ;; `(sp-wrap-overlay-face ((,class ())))
+ ;; `(sp-wrap-overlay-opening-pair ((,class ())))
+ ;; `(sp-wrap-tag-overlay-face ((,class ())))
+
`(speedbar-button-face ((,class (:foreground "green4"))))
`(speedbar-directory-face ((,class (:foreground "blue4"))))
`(speedbar-file-face ((,class (:foreground "cyan4"))))
@@ -640,7 +877,6 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(tex-verbatim ((,class (:foreground "blue"))))
`(tool-bar ((,class (:box (:line-width 1 :style released-button) :foreground "black" :background "gray75"))))
`(tooltip ((,class (:foreground "black" :background "light yellow"))))
- `(trailing-whitespace ((,class (:background "#F6EBFE"))))
`(traverse-match-face ((,class (:weight bold :foreground "blue violet"))))
`(vc-annotate-face-3F3FFF ((,class (:foreground "#3F3FFF" :background "black"))))
`(vc-annotate-face-3F6CFF ((,class (:foreground "#3F3FFF" :background "black"))))
@@ -655,11 +891,24 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(vc-annotate-face-83FF3F ((,class (:foreground "#B0FF3F" :background "black"))))
`(vc-annotate-face-B0FF3F ((,class (:foreground "#B0FF3F" :background "black"))))
`(vc-annotate-face-DDFF3F ((,class (:foreground "#FFF33F" :background "black"))))
+ `(vc-annotate-face-F6FFCC ((,class (:foreground "black" :background "#FFFFC0"))))
`(vc-annotate-face-FF3F3F ((,class (:foreground "#FF3F3F" :background "black"))))
`(vc-annotate-face-FF6C3F ((,class (:foreground "#FF3F3F" :background "black"))))
`(vc-annotate-face-FF993F ((,class (:foreground "#FF993F" :background "black"))))
`(vc-annotate-face-FFC63F ((,class (:foreground "#FF993F" :background "black"))))
`(vc-annotate-face-FFF33F ((,class (:foreground "#FFF33F" :background "black"))))
+
+ ;; ;; vc
+ ;; (vc-up-to-date-state ((,c :foreground ,(gc 'green-1))))
+ ;; (vc-edited-state ((,c :foreground ,(gc 'yellow+1))))
+ ;; (vc-missing-state ((,c :foreground ,(gc 'red))))
+ ;; (vc-conflict-state ((,c :foreground ,(gc 'red+2) :weight bold)))
+ ;; (vc-locked-state ((,c :foreground ,(gc 'cyan-1))))
+ ;; (vc-locally-added-state ((,c :foreground ,(gc 'blue))))
+ ;; (vc-needs-update-state ((,c :foreground ,(gc 'magenta))))
+ ;; (vc-removed-state ((,c :foreground ,(gc 'red-1))))
+
+ `(vhl/default-face ((,class ,volatile-highlight))) ; `volatile-highlights.el' (for undo, yank).
`(w3m-anchor ((,class ,link)))
`(w3m-arrived-anchor ((,class (:foreground "purple1"))))
`(w3m-bitmap-image-face ((,class (:foreground "gray4" :background "green"))))
@@ -676,38 +925,138 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(w3m-link-numbering ((,class (:foreground "#B4C7EB")))) ; mouseless browsing
`(w3m-strike-through-face ((,class (:strike-through t))))
`(w3m-underline-face ((,class (:underline t))))
- `(which-func ((,class (:weight bold :foreground "white"))))
+
+ ;; `(web-mode-block-attr-name-face ((,class ())))
+ ;; `(web-mode-block-attr-value-face ((,class ())))
+ ;; `(web-mode-block-comment-face ((,class ())))
+ ;; `(web-mode-block-control-face ((,class ())))
+ ;; `(web-mode-block-delimiter-face ((,class ())))
+ ;; `(web-mode-block-face ((,class ())))
+ ;; `(web-mode-block-string-face ((,class ())))
+ ;; `(web-mode-bold-face ((,class ())))
+ ;; `(web-mode-builtin-face ((,class ())))
+ ;; `(web-mode-comment-face ((,class ())))
+ ;; `(web-mode-comment-keyword-face ((,class ())))
+ ;; `(web-mode-constant-face ((,class ())))
+ ;; `(web-mode-css-at-rule-face ((,class ())))
+ ;; `(web-mode-css-color-face ((,class ())))
+ ;; `(web-mode-css-comment-face ((,class ())))
+ ;; `(web-mode-css-function-face ((,class ())))
+ ;; `(web-mode-css-priority-face ((,class ())))
+ ;; `(web-mode-css-property-name-face ((,class ())))
+ ;; `(web-mode-css-pseudo-class-face ((,class ())))
+ ;; `(web-mode-css-selector-face ((,class ())))
+ ;; `(web-mode-css-string-face ((,class ())))
+ ;; `(web-mode-css-variable-face ((,class ())))
+ ;; `(web-mode-current-column-highlight-face ((,class ())))
+ `(web-mode-current-element-highlight-face ((,class (:background "#99CCFF")))) ; #FFEE80
+ ;; `(web-mode-doctype-face ((,class ())))
+ ;; `(web-mode-error-face ((,class ())))
+ ;; `(web-mode-filter-face ((,class ())))
+ `(web-mode-folded-face ((,class (:box (:line-width 1 :color "#777777") :foreground "#9A9A6A" :background "#F3F349"))))
+ ;; `(web-mode-function-call-face ((,class ())))
+ ;; `(web-mode-function-name-face ((,class ())))
+ ;; `(web-mode-html-attr-custom-face ((,class ())))
+ ;; `(web-mode-html-attr-engine-face ((,class ())))
+ ;; `(web-mode-html-attr-equal-face ((,class ())))
+ `(web-mode-html-attr-name-face ((,class ,xml-attribute)))
+ ;; `(web-mode-html-attr-value-face ((,class ())))
+ ;; `(web-mode-html-entity-face ((,class ())))
+ `(web-mode-html-tag-bracket-face ((,class ,xml-tag)))
+ ;; `(web-mode-html-tag-custom-face ((,class ())))
+ `(web-mode-html-tag-face ((,class ,xml-tag)))
+ ;; `(web-mode-html-tag-namespaced-face ((,class ())))
+ ;; `(web-mode-inlay-face ((,class ())))
+ ;; `(web-mode-italic-face ((,class ())))
+ ;; `(web-mode-javascript-comment-face ((,class ())))
+ ;; `(web-mode-javascript-string-face ((,class ())))
+ ;; `(web-mode-json-comment-face ((,class ())))
+ ;; `(web-mode-json-context-face ((,class ())))
+ ;; `(web-mode-json-key-face ((,class ())))
+ ;; `(web-mode-json-string-face ((,class ())))
+ ;; `(web-mode-jsx-depth-1-face ((,class ())))
+ ;; `(web-mode-jsx-depth-2-face ((,class ())))
+ ;; `(web-mode-jsx-depth-3-face ((,class ())))
+ ;; `(web-mode-jsx-depth-4-face ((,class ())))
+ ;; `(web-mode-keyword-face ((,class ())))
+ ;; `(web-mode-param-name-face ((,class ())))
+ ;; `(web-mode-part-comment-face ((,class ())))
+ `(web-mode-part-face ((,class (:background "#FFFFE0"))))
+ ;; `(web-mode-part-string-face ((,class ())))
+ ;; `(web-mode-preprocessor-face ((,class ())))
+ `(web-mode-script-face ((,class (:background "#EFF0F1"))))
+ ;; `(web-mode-sql-keyword-face ((,class ())))
+ ;; `(web-mode-string-face ((,class ())))
+ ;; `(web-mode-style-face ((,class ())))
+ ;; `(web-mode-symbol-face ((,class ())))
+ ;; `(web-mode-type-face ((,class ())))
+ ;; `(web-mode-underline-face ((,class ())))
+ ;; `(web-mode-variable-name-face ((,class ())))
+ ;; `(web-mode-warning-face ((,class ())))
+ ;; `(web-mode-whitespace-face ((,class ())))
+
+ `(which-func ((,class (:weight bold :slant italic :foreground "white"))))
+ ;; `(which-key-command-description-face)
+ ;; `(which-key-group-description-face)
+ ;; `(which-key-highlighted-command-face)
+ ;; `(which-key-key-face)
+ `(which-key-local-map-description-face ((,class (:weight bold :background "#F3F7FC" :inherit which-key-command-description-face))))
+ ;; `(which-key-note-face)
+ ;; `(which-key-separator-face)
+ ;; `(which-key-special-key-face)
`(widget-button ((,class ,link)))
`(widget-button-pressed ((,class (:foreground "red"))))
`(widget-documentation ((,class (:foreground "green4"))))
`(widget-field ((,class (:background "gray85"))))
`(widget-inactive ((,class (:foreground "dim gray"))))
`(widget-single-line-field ((,class (:background "gray85"))))
- `(yas/field-debug-face ((,class (:background "ivory2"))))
- `(yas/field-highlight-face ((,class (:background "DarkSeaGreen1"))))
+ `(woman-bold ((,class (:weight bold :foreground "#F13D3D"))))
+ `(woman-italic ((,class (:weight bold :slant italic :foreground "#46BE1B"))))
+ `(woman-symbol ((,class (:weight bold :foreground "purple"))))
+ `(yas-field-debug-face ((,class (:foreground "white" :background "#A62154"))))
+ `(yas-field-highlight-face ((,class (:box (:line-width 1 :color "#838383") :foreground "black" :background "#D4DCD8"))))
+
+ ;; `(ztreep-arrow-face ((,class ())))
+ ;; `(ztreep-diff-header-face ((,class ())))
+ ;; `(ztreep-diff-header-small-face ((,class ())))
+ `(ztreep-diff-model-add-face ((,class (:weight bold :foreground "#008800"))))
+ `(ztreep-diff-model-diff-face ((,class (:weight bold :foreground "#0044DD"))))
+ `(ztreep-diff-model-ignored-face ((,class (:strike-through t :foreground "#9E9E9E"))))
+ `(ztreep-diff-model-normal-face ((,class (:foreground "#000000"))))
+ ;; `(ztreep-expand-sign-face ((,class ())))
+ ;; `(ztreep-header-face ((,class ())))
+ ;; `(ztreep-leaf-face ((,class ())))
+ ;; `(ztreep-node-face ((,class ())))
+
))
(custom-theme-set-variables 'leuven
- '(ansi-color-faces-vector
- [default default default italic underline success warning error])
- '(ansi-color-names-vector
- ["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"])
- ; colors used in Shell mode
+
+ ;; highlight-sexp-mode.
+ '(hl-sexp-background-color "#efebe9")
+
+ '(ansi-color-faces-vector
+ [default default default italic underline success warning error])
+
+ ;; Colors used in Shell mode.
+ '(ansi-color-names-vector
+ ["black" "red3" "ForestGreen" "yellow3" "blue" "magenta3" "DeepSkyBlue" "gray50"])
)
;;;###autoload
(when (and (boundp 'custom-theme-load-path)
load-file-name)
- ;; add theme folder to `custom-theme-load-path' when installing over MELPA
+ ;; Add theme folder to `custom-theme-load-path' when installing over MELPA.
(add-to-list 'custom-theme-load-path
(file-name-as-directory (file-name-directory load-file-name))))
(provide-theme 'leuven)
+;; This is for the sake of Emacs.
;; Local Variables:
+;; time-stamp-end: "$"
;; time-stamp-format: "%:y%02m%02d.%02H%02M"
;; time-stamp-start: "Version: "
-;; time-stamp-end: "$"
;; End:
;;; leuven-theme.el ends here
--
2.21.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk
2020-05-13 17:36 ` Fab Rice
@ 2020-08-08 12:23 ` Lars Ingebrigtsen
0 siblings, 0 replies; 15+ messages in thread
From: Lars Ingebrigtsen @ 2020-08-08 12:23 UTC (permalink / raw)
To: Fab Rice; +Cc: Stefan Kangas, 40759, Serghei, dgutov
Fab Rice <posh18@pirilampo.be> writes:
> I've pushed new changes, following your 3 (types of) remarks.
>
> Please find it here, attached.
>
> Thanks a lot!
As far as I can see, all the comments were taken into consideration in
this final version of the patch, but it was not applied?
So I've now done so in Emacs 28.1. The patch didn't apply cleanly, so I
merged a few of the lines by hand. Please look the results over to see
whether I messed up or not.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2020-08-08 12:23 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-22 5:31 bug#40759: 26.3; Update Leuven-theme in Emacs dev trunk Fab Rice
2020-04-22 6:10 ` Stefan Kangas
2020-04-22 19:58 ` Fab Rice
2020-04-23 18:47 ` Stefan Kangas
2020-04-24 10:57 ` Serghei via Bug reports for GNU Emacs, the Swiss army knife of text editors
2020-04-24 11:26 ` Eli Zaretskii
2020-04-24 12:09 ` Fab Rice
2020-04-25 8:49 ` Eli Zaretskii
2020-04-25 14:36 ` Dmitry Gutov
2020-05-04 12:35 ` Stefan Kangas
2020-05-04 14:58 ` Eli Zaretskii
2020-05-04 15:11 ` Stefan Kangas
2020-05-09 16:48 ` Stefan Kangas
2020-05-13 17:36 ` Fab Rice
2020-08-08 12:23 ` Lars Ingebrigtsen
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).