branch: elpa/spacemacs-theme
commit 9f0e95f0031a749a56734db66c29323c1a22d3d0
Author: nashamri <[email protected]>
Commit: nashamri <[email protected]>
Refactor keywords
---
spacemacs-common.el | 113 +++++++++++++++++++++++++---------------------------
1 file changed, 55 insertions(+), 58 deletions(-)
diff --git a/spacemacs-common.el b/spacemacs-common.el
index d0f2bf8605..b3f61416d5 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -62,10 +62,7 @@
(bg2 (if (eq variant 'dark) (if (display-graphic-p)
"#212026" "#1c1c1c") (if (display-graphic-p) "#efeae9" "#e4e4e4")))
(bg3 (if (eq variant 'dark) (if (display-graphic-p)
"#100a14" "#121212") (if (display-graphic-p) "#e3dedd" "#d0d0d0")))
(bg4 (if (eq variant 'dark) (if (display-graphic-p)
"#0a0814" "#080808") (if (display-graphic-p) "#d2ceda" "#bcbcbc")))
- (key1 (if (eq variant 'dark) (if (display-graphic-p)
"#4f97d7" "#4f97d7") (if (display-graphic-p) "#4f97d7" "#4f97d7")))
- (key2 (if (eq variant 'dark) (if (display-graphic-p)
"#277bb8" "#277bb8") (if (display-graphic-p) "#277bb8" "#277bb8")))
- (builtin (if (eq variant 'dark) (if (display-graphic-p)
"#1f71ab" "#268bd2") (if (display-graphic-p) "#1f71ab" "#268bd2")))
- (keyword (if (eq variant 'dark) (if (display-graphic-p)
"#237fbf" "#268bd2") (if (display-graphic-p) "#237fbf" "#268bd2")))
+ (keyword (if (eq variant 'dark) (if (display-graphic-p)
"#4f97d7" "#268bd2") (if (display-graphic-p) "#3a81c3" "#268bd2")))
(const (if (eq variant 'dark) (if (display-graphic-p)
"#a45bad" "#d75fd7") (if (display-graphic-p) "#4e3163" "#8700af")))
(comment (if (eq variant 'dark) (if (display-graphic-p)
"#2aa1ae" "#008787") (if (display-graphic-p) "#2aa1ae" "#008787")))
(comment-bg (if (eq variant 'dark) (if (display-graphic-p)
"#292e34" "#262626") (if (display-graphic-p) "#ecf3ec" "#ffffff")))
@@ -76,7 +73,6 @@
(var (if (eq variant 'dark) (if (display-graphic-p)
"#7590db" "#8787d7") (if (display-graphic-p) "#715ab1" "#af5fd7")))
(err (if (eq variant 'dark) (if (display-graphic-p)
"#e0211d" "#e0211d") (if (display-graphic-p) "#e0211d" "#e0211d")))
(war (if (eq variant 'dark) (if (display-graphic-p)
"#dc752f" "#dc752f") (if (display-graphic-p) "#dc752f" "#dc752f")))
- (inf (if (eq variant 'dark) (if (display-graphic-p)
"#2f96dc" "#2f96dc") (if (display-graphic-p) "#2f96dc" "#2f96dc")))
(suc (if (eq variant 'dark) (if (display-graphic-p)
"#86dc2f" "#86dc2f") (if (display-graphic-p) "#86dc2f" "#87ff00")))
(green (if (eq variant 'dark) (if (display-graphic-p)
"#67b11d" "#67b11d") (if (display-graphic-p) "#67b11d" "#5faf00")))
(yellow (if (eq variant 'dark) (if (display-graphic-p)
"#b1951d" "#875f00") (if (display-graphic-p) "#b1951d" "#875f00")))
@@ -102,7 +98,8 @@
(highlight (if (eq variant 'dark) (if (display-graphic-p)
"#333c45" "#444444") (if (display-graphic-p) "#d3d3e7" "#d7d7ff")))
(lnum (if (eq variant 'dark) (if (display-graphic-p)
"#44505c" "#444444") (if (display-graphic-p) "#a8a8bf" "#af87af")))
(green-bg (if (eq variant 'dark) (if (display-graphic-p)
"#29422d" "#262626") (if (display-graphic-p) "#dae6d0" "#ffffff")))
- (red-bg (if (eq variant 'dark) (if (display-graphic-p)
"#512e31" "#262626") (if (display-graphic-p) "#eed9d2" "#ffffff"))))
+ (red-bg (if (eq variant 'dark) (if (display-graphic-p)
"#512e31" "#262626") (if (display-graphic-p) "#eed9d2" "#ffffff")))
+ )
(custom-theme-set-faces
theme-name
@@ -115,7 +112,7 @@
`(error ((,class (:foreground ,err))))
`(eval-sexp-fu-flash ((,class (:background ,suc :foreground ,bg1))))
`(eval-sexp-fu-flash-error ((,class (:background ,err :foreground ,bg1))))
- `(font-lock-builtin-face ((,class (:foreground ,builtin))))
+ `(font-lock-builtin-face ((,class (:foreground ,keyword))))
`(font-lock-comment-face ((,class (:foreground ,comment :background
,(when spacemacs-theme-comment-bg comment-bg)))))
`(font-lock-constant-face ((,class (:foreground ,const))))
`(font-lock-doc-face ((,class (:foreground ,comment))))
@@ -131,11 +128,11 @@
`(fringe ((,class (:background ,bg1 :foreground ,base))))
`(highlight ((,class (:foreground ,base :background ,bg3))))
`(hl-line ((,class (:background ,bg2))))
- `(isearch ((,class (:bold t :foreground ,bg1 :background ,inf))))
- `(lazy-highlight ((,class (:foreground ,bg1 :background ,inf :weight
normal))))
+ `(isearch ((,class (:bold t :foreground ,bg1 :background ,keyword))))
+ `(lazy-highlight ((,class (:foreground ,bg1 :background ,keyword :weight
normal))))
`(link ((,class (:foreground ,comment :underline t))))
`(link-visited ((,class (:foreground ,comp :underline t))))
- `(match ((,class (:background ,bg1 :foreground ,inf :weight bold))))
+ `(match ((,class (:background ,bg1 :foreground ,keyword :weight bold))))
`(minibuffer-prompt ((,class (:bold t :foreground ,keyword))))
`(page-break-lines ((,class (:foreground ,active2))))
`(popup-tip-face ((,class (:background ,ttip-sl :foreground ,base :bold
nil :italic nil :underline nil))))
@@ -159,7 +156,7 @@
`(company-scrollbar-fg ((,class (:background ,active2))))
`(company-template-field ((,class (:inherit region))))
`(company-tooltip ((,class (:background ,ttip-bg :foreground ,ttip))))
- `(company-tooltip-annotation ((,class (:background ,ttip-bg :foreground
,inf))))
+ `(company-tooltip-annotation ((,class (:background ,ttip-bg :foreground
,keyword))))
`(company-tooltip-common ((,class (:background ,ttip-bg :foreground
,base))))
`(company-tooltip-common-selection ((,class (:foreground ,base))))
`(company-tooltip-mouse ((,class (:inherit highlight))))
@@ -168,23 +165,23 @@
;;;;; diff
`(diff-added ((,class :background nil :foreground ,green)))
- `(diff-changed ((,class :background nil :foreground ,inf)))
+ `(diff-changed ((,class :background nil :foreground ,keyword)))
`(diff-header ((,class :background ,org-cb-ln-bg :foreground
,func)))
`(diff-indicator-added ((,class :background nil :foreground ,green)))
- `(diff-indicator-changed ((,class :background nil :foreground ,inf)))
+ `(diff-indicator-changed ((,class :background nil :foreground ,keyword)))
`(diff-indicator-removed ((,class :background nil :foreground ,red)))
`(diff-refine-added ((,class :background ,green :foreground ,bg4)))
- `(diff-refine-changed ((,class :background ,inf :foreground ,bg4)))
+ `(diff-refine-changed ((,class :background ,keyword :foreground ,bg4)))
`(diff-refine-removed ((,class :background ,red :foreground ,bg4)))
`(diff-removed ((,class :background nil :foreground ,red)))
;;;;; diff-hl
- `(diff-hl-change ((,class :background ,inf :foreground nil)))
+ `(diff-hl-change ((,class :background ,keyword :foreground nil)))
`(diff-hl-delete ((,class :background ,err :foreground nil)))
`(diff-hl-insert ((,class :background ,suc :foreground nil)))
;;;;; dired
- `(dired-directory ((,class (:foreground ,key1 :background ,bg1 :weight
bold))))
+ `(dired-directory ((,class (:foreground ,keyword :background ,bg1 :weight
bold))))
`(dired-flagged ((,class (:foreground ,red))))
`(dired-header ((,class (:foreground ,comp :weight bold))))
`(dired-ignored ((,class (:inherit shadow))))
@@ -198,7 +195,7 @@
`(ediff-current-diff-A ((,class(:background ,red-bg :foreground ,red))))
`(ediff-current-diff-Ancestor ((,class(:background ,org-h2-bg :foreground
,str))))
`(ediff-current-diff-B ((,class(:background ,green-bg :foreground
,green))))
- `(ediff-current-diff-C ((,class(:background ,org-h1-bg :foreground
,inf))))
+ `(ediff-current-diff-C ((,class(:background ,org-h1-bg :foreground
,keyword))))
`(ediff-even-diff-A ((,class(:background ,bg3))))
`(ediff-even-diff-Ancestor ((,class(:background ,bg3))))
`(ediff-even-diff-B ((,class(:background ,bg3))))
@@ -216,7 +213,7 @@
`(ein:cell-input-area((,class (:background ,bg2))))
`(ein:cell-input-prompt ((,class (:foreground ,(if (eq variant 'dark) suc
green)))))
`(ein:cell-output-prompt ((,class (:foreground ,err))))
- `(ein:notification-tab-normal ((,class (:foreground ,builtin))))
+ `(ein:notification-tab-normal ((,class (:foreground ,keyword))))
`(ein:notification-tab-selected ((,class (:foreground ,(if (eq variant
'dark) suc green) :bold t))))
;;;;; eldoc
@@ -228,18 +225,18 @@
;;;;; erc
`(erc-input-face ((,class (:foreground ,func))))
- `(erc-my-nick-face ((,class (:foreground ,key1))))
- `(erc-nick-default-face ((,class (:foreground ,inf))))
+ `(erc-my-nick-face ((,class (:foreground ,keyword))))
+ `(erc-nick-default-face ((,class (:foreground ,keyword))))
`(erc-nick-prefix-face ((,class (:foreground ,yellow))))
`(erc-notice-face ((,class (:foreground ,str))))
`(erc-prompt-face ((,class (:foreground ,(if (eq variant 'dark) suc
green) :bold t))))
- `(erc-timestamp-face ((,class (:foreground ,builtin))))
+ `(erc-timestamp-face ((,class (:foreground ,keyword))))
;;;;; eshell
`(eshell-ls-archive ((,class (:foreground ,red :weight bold))))
`(eshell-ls-backup ((,class (:inherit font-lock-comment-face))))
`(eshell-ls-clutter ((,class (:inherit font-lock-comment-face))))
- `(eshell-ls-directory ((,class (:foreground ,inf :weight bold))))
+ `(eshell-ls-directory ((,class (:foreground ,keyword :weight bold))))
`(eshell-ls-executable ((,class (:foreground ,suc :weight bold))))
`(eshell-ls-missing ((,class (:inherit font-lock-warning-face))))
`(eshell-ls-product ((,class (:inherit font-lock-doc-face))))
@@ -255,12 +252,12 @@
(,class (:foreground ,base :background ,err :weight bold :underline
t))))
`(flycheck-error-list-checker-name ((,class (:foreground ,keyword))))
`(flycheck-fringe-error ((,class (:foreground ,err :weight bold))))
- `(flycheck-fringe-info ((,class (:foreground ,inf :weight bold))))
+ `(flycheck-fringe-info ((,class (:foreground ,keyword :weight bold))))
`(flycheck-fringe-warning ((,class (:foreground ,war :weight bold))))
`(flycheck-info
((,(append '((supports :underline (:style line))) class)
- (:underline (:style line :color ,inf)))
- (,class (:foreground ,base :background ,inf :weight bold :underline
t))))
+ (:underline (:style line :color ,keyword)))
+ (,class (:foreground ,base :background ,keyword :weight bold
:underline t))))
`(flycheck-warning
((,(append '((supports :underline (:style line))) class)
(:underline (:style line :color ,war)))
@@ -269,10 +266,10 @@
;;;;; git-gutter-fr
`(git-gutter-fr:added ((,class (:foreground ,green :weight bold))))
`(git-gutter-fr:deleted ((,class (:foreground ,war :weight bold))))
- `(git-gutter-fr:modified ((,class (:foreground ,inf :weight bold))))
+ `(git-gutter-fr:modified ((,class (:foreground ,keyword :weight bold))))
;;;;; git-timemachine
- `(git-timemachine-minibuffer-detail-face ((,class (:foreground ,inf :bold
t :background ,org-h1-bg))))
+ `(git-timemachine-minibuffer-detail-face ((,class (:foreground ,keyword
:bold t :background ,org-h1-bg))))
;;;;; gnus
`(gnus-emphasis-highlight-words ((,class (:background ,(if (eq variant
'dark) err suc) :foreground ,(when (eq variant 'light) bg1)))))
@@ -284,8 +281,8 @@
;;;;; guide-key
`(guide-key/highlight-command-face ((,class (:foreground ,base))))
- `(guide-key/key-face ((,class (:foreground ,key1))))
- `(guide-key/prefix-command-face ((,class (:foreground ,key2 :weight
bold))))
+ `(guide-key/key-face ((,class (:foreground ,keyword))))
+ `(guide-key/prefix-command-face ((,class (:foreground ,keyword :weight
bold))))
;;;;; helm
`(helm-bookmark-directory ((,class (:inherit helm-ff-directory))))
@@ -297,12 +294,12 @@
`(helm-buffer-directory ((,class (:foreground ,base :background ,bg1))))
`(helm-buffer-file ((,class (:foreground ,base :background ,bg1))))
`(helm-buffer-not-saved ((,class (:foreground ,comp :background ,bg1))))
- `(helm-buffer-process ((,class (:foreground ,builtin :background ,bg1))))
+ `(helm-buffer-process ((,class (:foreground ,keyword :background ,bg1))))
`(helm-buffer-saved-out ((,class (:foreground ,base :background ,bg1))))
`(helm-buffer-size ((,class (:foreground ,base :background ,bg1))))
- `(helm-candidate-number ((,class (:background ,bg1 :foreground ,inf :bold
t))))
- `(helm-ff-directory ((,class (:foreground ,key1 :background ,bg1 :weight
bold))))
- `(helm-ff-dotted-directory ((,class (:foreground ,key1 :background ,bg1
:weight bold))))
+ `(helm-candidate-number ((,class (:background ,bg1 :foreground ,keyword
:bold t))))
+ `(helm-ff-directory ((,class (:foreground ,keyword :background ,bg1
:weight bold))))
+ `(helm-ff-dotted-directory ((,class (:foreground ,keyword :background
,bg1 :weight bold))))
`(helm-ff-executable ((,class (:foreground ,suc :background ,bg1 :weight
normal))))
`(helm-ff-file ((,class (:foreground ,base :background ,bg1 :weight
normal))))
`(helm-ff-invalid-symlink ((,class (:foreground ,red :background ,bg1
:weight bold))))
@@ -314,7 +311,7 @@
`(helm-grep-lineno ((,class (:foreground ,base :background ,bg1))))
`(helm-grep-match ((,class (:foreground nil :background nil :inherit
helm-match))))
`(helm-header ((,class (:foreground ,base :background ,bg1 :underline nil
:box nil))))
- `(helm-header-line-left-margin ((,class (:foreground ,inf :background
,nil))))
+ `(helm-header-line-left-margin ((,class (:foreground ,keyword :background
,nil))))
`(helm-match ((,class (:inherit match))))
`(helm-match-item ((,class (:inherit match))))
`(helm-moccur-buffer ((,class (:foreground ,func :background ,bg1))))
@@ -322,9 +319,9 @@
`(helm-selection-line ((,class (:background ,bg2))))
`(helm-separator ((,class (:foreground ,comp :background ,bg1))))
`(helm-source-header ((,class (:background ,comp :foreground ,bg1 :bold
t))))
- `(helm-time-zone-current ((,class (:foreground ,builtin :background
,bg1))))
+ `(helm-time-zone-current ((,class (:foreground ,keyword :background
,bg1))))
`(helm-time-zone-home ((,class (:foreground ,comp :background ,bg1))))
- `(helm-visible-mark ((,class (:foreground ,inf :background ,bg3))))
+ `(helm-visible-mark ((,class (:foreground ,keyword :background ,bg3))))
;;;;; helm-swoop
`(helm-swoop-target-line-block-face ((,class (:foreground ,base
:background ,highlight))))
@@ -337,14 +334,14 @@
;;;;; ido
`(ido-first-match ((,class (:foreground ,comp :bold t))))
`(ido-only-match ((,class (:foreground ,(if (eq variant 'dark) suc red)
:bold t))))
- `(ido-subdir ((,class (:foreground ,key1))))
+ `(ido-subdir ((,class (:foreground ,keyword))))
`(ido-vertical-match-face ((,class (:foreground ,comp :underline nil))))
;;;;; info
`(info-header-xref ((,class (:foreground ,func :underline t))))
`(info-menu ((,class (:foreground ,suc))))
`(info-node ((,class (:foreground ,func :bold t))))
- `(info-quoted-name ((,class (:foreground ,builtin))))
+ `(info-quoted-name ((,class (:foreground ,keyword))))
`(info-reference-item ((,class (:background nil :underline t :bold t))))
`(info-string ((,class (:foreground ,str))))
`(info-title-1 ((,class (:height 1.4 :bold t))))
@@ -370,8 +367,8 @@
`(magit-blame-summary ((,class :background ,org-h4-bg :foreground
,yellow)))
`(magit-blame-date ((,class :background ,org-h4-bg :foreground
,green)))
`(magit-branch ((,class (:foreground ,const :weight bold))))
- `(magit-branch-current ((,class (:background ,org-h1-bg :foreground ,inf
:weight bold :box t))))
- `(magit-branch-local ((,class (:background ,org-h1-bg :foreground ,inf
:weight bold))))
+ `(magit-branch-current ((,class (:background ,org-h1-bg :foreground
,keyword :weight bold :box t))))
+ `(magit-branch-local ((,class (:background ,org-h1-bg :foreground
,keyword :weight bold))))
`(magit-branch-remote ((,class (:background ,org-h2-bg :foreground ,str
:weight bold))))
`(magit-diff-context-highlight ((,class (:background ,bg2 :foreground
,base))))
`(magit-diff-file-header ((,class (:background ,comment-bg :foreground
,comment))))
@@ -386,7 +383,7 @@
`(magit-item-highlight ((,class :background ,bg2)))
`(magit-log-author ((,class (:foreground ,func))))
`(magit-log-head-label-head ((,class (:background ,yellow :foreground
,bg1 :bold t))))
- `(magit-log-head-label-local ((,class (:background ,inf :foreground ,bg1
:bold t))))
+ `(magit-log-head-label-local ((,class (:background ,keyword :foreground
,bg1 :bold t))))
`(magit-log-head-label-remote ((,class (:background ,suc :foreground ,bg1
:bold t))))
`(magit-log-head-label-tags ((,class (:background ,violet :foreground
,bg1 :bold t))))
`(magit-log-head-label-wip ((,class (:background ,cyan :foreground ,bg1
:bold t))))
@@ -395,7 +392,7 @@
`(magit-process-ok ((,class (:foreground ,func :weight bold))))
`(magit-section-heading ((,class (:foreground ,keyword :weight
bold))))
`(magit-section-highlight ((,class (:background ,bg2))))
- `(magit-section-title ((,class (:background ,bg1 :foreground ,builtin
:weight bold))))
+ `(magit-section-title ((,class (:background ,bg1 :foreground ,keyword
:weight bold))))
;;;;; mode-line
`(mode-line ((,class (:foreground ,base :background ,active1
:box (:color ,m-line-brdr :line-width 1)))))
@@ -403,7 +400,7 @@
`(mode-line-buffer-id ((,class (:bold t :foreground ,func))))
;;;;; neotree
- `(neo-dir-link-face ((,class (:foreground ,inf :weight bold))))
+ `(neo-dir-link-face ((,class (:foreground ,keyword :weight bold))))
`(neo-expand-btn-face ((,class (:foreground ,base))))
`(neo-file-link-face ((,class (:foreground ,base))))
`(neo-root-dir-face ((,class (:foreground ,func :weight bold))))
@@ -427,15 +424,15 @@
`(org-document-info-keyword ((,class (:foreground ,org-ml))))
`(org-document-title ((,class (:foreground ,func :weight bold :height
,(if spacemacs-theme-org-height 1.4 1.0) :underline t))))
`(org-done ((,class (:foreground ,(if (eq variant 'dark) suc green) :bold
t :background ,org-h3-bg))))
- `(org-ellipsis ((,class (:foreground ,builtin))))
+ `(org-ellipsis ((,class (:foreground ,keyword))))
`(org-footnote ((,class (:underline t :foreground ,base))))
`(org-hide ((,class (:foreground ,base))))
`(org-kbd ((,class (:inherit region :foreground ,base :box (:line-width 1
:style released-button)))))
- `(org-level-1 ((,class (:bold t :foreground ,inf :height ,(if
spacemacs-theme-org-height 1.3 1.0) :background ,(when
spacemacs-theme-org-highlight org-h1-bg)))))
+ `(org-level-1 ((,class (:bold t :foreground ,keyword :height ,(if
spacemacs-theme-org-height 1.3 1.0) :background ,(when
spacemacs-theme-org-highlight org-h1-bg)))))
`(org-level-2 ((,class (:bold t :foreground ,str :height ,(if
spacemacs-theme-org-height 1.2 1.0) :background ,(when
spacemacs-theme-org-highlight org-h2-bg)))))
`(org-level-3 ((,class (:bold nil :foreground ,green :height ,(if
spacemacs-theme-org-height 1.1 1.0) :background ,(when
spacemacs-theme-org-highlight org-h3-bg)))))
`(org-level-4 ((,class (:bold nil :foreground ,yellow :background ,(when
spacemacs-theme-org-highlight org-h4-bg)))))
- `(org-level-5 ((,class (:bold nil :foreground ,inf))))
+ `(org-level-5 ((,class (:bold nil :foreground ,keyword))))
`(org-level-6 ((,class (:bold nil :foreground ,str))))
`(org-level-7 ((,class (:bold nil :foreground ,green))))
`(org-level-8 ((,class (:bold nil :foreground ,yellow))))
@@ -450,7 +447,7 @@
`(org-special-keyword ((,class (:foreground ,func))))
`(org-table ((,class (:foreground ,yellow :background ,org-h4-bg))))
`(org-todo ((,class (:foreground ,war :bold t :background ,org-h4-bg))))
- `(org-verbatim ((,class (:foreground ,inf))))
+ `(org-verbatim ((,class (:foreground ,keyword))))
`(org-verse ((,class (:inherit org-block :slant italic))))
`(org-warning ((,class (:foreground ,err))))
@@ -464,12 +461,12 @@
`(powerline-inactive2 ((,class (:background ,bg2 :foreground ,base))))
;;;;; rainbow-delimiters
- `(rainbow-delimiters-depth-1-face ((,class :foreground ,inf)))
+ `(rainbow-delimiters-depth-1-face ((,class :foreground ,keyword)))
`(rainbow-delimiters-depth-2-face ((,class :foreground ,func)))
`(rainbow-delimiters-depth-3-face ((,class :foreground ,str)))
`(rainbow-delimiters-depth-4-face ((,class :foreground ,green)))
`(rainbow-delimiters-depth-5-face ((,class :foreground ,yellow)))
- `(rainbow-delimiters-depth-6-face ((,class :foreground ,inf)))
+ `(rainbow-delimiters-depth-6-face ((,class :foreground ,keyword)))
`(rainbow-delimiters-depth-7-face ((,class :foreground ,func)))
`(rainbow-delimiters-depth-8-face ((,class :foreground ,str)))
`(rainbow-delimiters-unmatched-face ((,class :foreground ,err :overline
t)))
@@ -489,17 +486,17 @@
;;;;; term
`(term ((,class (:foreground ,base :background ,bg1))))
`(term-color-black ((,class (:foreground ,bg4))))
- `(term-color-blue ((,class (:foreground ,inf))))
+ `(term-color-blue ((,class (:foreground ,keyword))))
`(term-color-cyan ((,class (:foreground ,cyan))))
`(term-color-green ((,class (:foreground ,green))))
- `(term-color-magenta ((,class (:foreground ,builtin))))
+ `(term-color-magenta ((,class (:foreground ,violet))))
`(term-color-red ((,class (:foreground ,red))))
`(term-color-white ((,class (:foreground ,base))))
`(term-color-yellow ((,class (:foreground ,yellow))))
;;;;; which-key
`(which-key-command-description-face ((,class (:foreground ,base))))
- `(which-key-group-description-face ((,class (:foreground ,key2))))
+ `(which-key-group-description-face ((,class (:foreground ,keyword))))
`(which-key-key-face ((,class (:foreground ,func :bold t))))
`(which-key-separator-face ((,class (:background nil :foreground ,str))))
`(which-key-special-key-face ((,class (:background ,func :foreground
,bg1))))
@@ -523,21 +520,21 @@
`(ffap ((,class (:foreground ,base))))
`(flx-highlight-face ((,class (:foreground ,comp :underline nil))))
`(font-latex-bold-face ((,class (:foreground ,comp))))
- `(font-latex-italic-face ((,class (:foreground ,key2 :italic t))))
+ `(font-latex-italic-face ((,class (:foreground ,keyword :italic t))))
`(font-latex-match-reference-keywords ((,class (:foreground ,const))))
`(font-latex-match-variable-keywords ((,class (:foreground ,var))))
`(font-latex-string-face ((,class (:foreground ,str))))
- `(icompletep-determined ((,class :foreground ,builtin)))
+ `(icompletep-determined ((,class :foreground ,keyword)))
`(js2-external-variable ((,class (:foreground ,comp ))))
`(js2-function-param ((,class (:foreground ,const))))
`(js2-jsdoc-html-tag-delimiter ((,class (:foreground ,str))))
- `(js2-jsdoc-html-tag-name ((,class (:foreground ,key1))))
+ `(js2-jsdoc-html-tag-name ((,class (:foreground ,keyword))))
`(js2-jsdoc-value ((,class (:foreground ,str))))
`(js2-private-function-call ((,class (:foreground ,const))))
`(js2-private-member ((,class (:foreground ,base))))
`(js3-error-face ((,class (:underline ,war))))
`(js3-external-variable-face ((,class (:foreground ,var))))
- `(js3-function-param-face ((,class (:foreground ,key2))))
+ `(js3-function-param-face ((,class (:foreground ,keyword))))
`(js3-instance-member-face ((,class (:foreground ,const))))
`(js3-jsdoc-tag-face ((,class (:foreground ,keyword))))
`(js3-warning-face ((,class (:underline ,keyword))))
@@ -547,7 +544,7 @@
`(mu4e-view-url-number-face ((,class (:foreground ,comp))))
`(slime-repl-inputed-output-face ((,class (:foreground ,comp))))
`(trailing-whitespace ((,class :foreground nil :background ,err)))
- `(undo-tree-visualizer-current-face ((,class :foreground ,builtin)))
+ `(undo-tree-visualizer-current-face ((,class :foreground ,keyword)))
`(undo-tree-visualizer-default-face ((,class :foreground ,base)))
`(undo-tree-visualizer-register-face ((,class :foreground ,comp)))
`(undo-tree-visualizer-unmodified-face ((,class :foreground ,var)))
@@ -558,7 +555,7 @@
`(web-mode-function-name-face ((,class (:inherit
,font-lock-function-name-face))))
`(web-mode-html-attr-name-face ((,class (:foreground ,func))))
`(web-mode-html-attr-value-face ((,class (:foreground ,keyword))))
- `(web-mode-html-tag-face ((,class (:foreground ,builtin))))
+ `(web-mode-html-tag-face ((,class (:foreground ,keyword))))
`(web-mode-keyword-face ((,class (:foreground ,keyword))))
`(web-mode-string-face ((,class (:foreground ,str))))
`(web-mode-type-face ((,class (:inherit ,font-lock-type-face))))
