commit 471fff0f4c706f75b9ab5bfbc7fbfe28e29ac1d5
parent 83da874708b3d2d75bf1d8654fc444e5786f9769
Author: Bozhidar Batsov <bozhidar@batsov.com>
Date: Wed, 19 Jun 2013 04:28:25 -0700
Merge pull request #66 from lunaryorn/fix-incorrect-faces
Fix a bunch of faces
Diffstat:
| M | solarized.el | | | 93 | +++++++++++++++++++++++++++++++++++++------------------------------------------ |
1 file changed, 44 insertions(+), 49 deletions(-)
diff --git a/solarized.el b/solarized.el
@@ -408,13 +408,13 @@
;; eshell
`(eshell-prompt ((,class (:foreground ,yellow :weight bold))))
`(eshell-ls-archive ((,class (:foreground ,red :weight bold))))
- `(eshell-ls-backup ((,class (:inherit font-lock-comment))))
- `(eshell-ls-clutter ((,class (:inherit font-lock-comment))))
+ `(eshell-ls-backup ((,class (:inherit font-lock-comment-face))))
+ `(eshell-ls-clutter ((,class (:inherit font-lock-comment-face))))
`(eshell-ls-directory ((,class (:foreground ,blue :weight bold))))
`(eshell-ls-executable ((,class (:foreground ,red :weight bold))))
`(eshell-ls-unreadable ((,class (:foreground ,solarized-fg))))
- `(eshell-ls-missing ((,class (:inherit font-lock-warning))))
- `(eshell-ls-product ((,class (:inherit font-lock-doc))))
+ `(eshell-ls-missing ((,class (:inherit font-lock-warning-face))))
+ `(eshell-ls-product ((,class (:inherit font-lock-doc-face))))
`(eshell-ls-special ((,class (:foreground ,yellow :weight bold))))
`(eshell-ls-symlink ((,class (:foreground ,cyan :weight bold))))
@@ -469,17 +469,18 @@
`(erc-action-face ((,class (:inherit erc-default-face))))
`(erc-bold-face ((,class (:weight bold))))
`(erc-current-nick-face ((,class (:foreground ,blue :weight bold))))
- `(erc-dangerous-host-face ((,class (:inherit font-lock-warning))))
+ `(erc-dangerous-host-face ((,class (:inherit font-lock-warning-face))))
`(erc-default-face ((,class (:foreground ,solarized-fg))))
- `(erc-direct-msg-face ((,class (:inherit erc-default))))
- `(erc-error-face ((,class (:inherit font-lock-warning))))
- `(erc-fool-face ((,class (:inherit erc-default))))
- `(erc-highlight-face ((,class (:inherit hover-highlight))))
+ `(erc-highlight-face ((,class (:inherit (:inherit erc-default-face
+ :background ,solarized-hl)))))
+ `(erc-direct-msg-face ((,class (:inherit erc-default-face))))
+ `(erc-error-face ((,class (:inherit font-lock-warning-face))))
+ `(erc-fool-face ((,class (:inherit erc-default-face))))
`(erc-input-face ((,class (:foreground ,yellow))))
`(erc-keyword-face ((,class (:foreground ,blue :weight bold))))
`(erc-nick-default-face ((,class (:foreground ,yellow :weight bold))))
`(erc-my-nick-face ((,class (:foreground ,red :weight bold))))
- `(erc-nick-msg-face ((,class (:inherit erc-default))))
+ `(erc-nick-msg-face ((,class (:inherit erc-default-face))))
`(erc-notice-face ((,class (:foreground ,green))))
`(erc-pal-face ((,class (:foreground ,orange :weight bold))))
`(erc-prompt-face ((,class (:foreground ,orange :background ,solarized-bg :weight bold))))
@@ -515,29 +516,23 @@
`(guide-key/prefix-command-face ((,class (:foreground ,green))))
;; gnus
- `(gnus-group-mail-1-face ((,class (:weight bold :inherit gnus-group-mail-1-empty))))
- `(gnus-group-mail-1-empty-face ((,class (:inherit gnus-group-news-1-empty))))
- `(gnus-group-mail-2-face ((,class (:weight bold :inherit gnus-group-mail-2-empty))))
- `(gnus-group-mail-2-empty-face ((,class (:inherit gnus-group-news-2-empty))))
- `(gnus-group-mail-3-face ((,class (:weight bold :inherit gnus-group-mail-3-empty))))
- `(gnus-group-mail-3-empty-face ((,class (:inherit gnus-group-news-3-empty))))
- `(gnus-group-mail-4-face ((,class (:weight bold :inherit gnus-group-mail-4-empty))))
- `(gnus-group-mail-4-empty-face ((,class (:inherit gnus-group-news-4-empty))))
- `(gnus-group-mail-5-face ((,class (:weight bold :inherit gnus-group-mail-5-empty))))
- `(gnus-group-mail-5-empty-face ((,class (:inherit gnus-group-news-5-empty))))
- `(gnus-group-mail-6-face ((,class (:weight bold :inherit gnus-group-mail-6-empty))))
- `(gnus-group-mail-6-empty-face ((,class (:inherit gnus-group-news-6-empty))))
- `(gnus-group-mail-low-face ((,class (:weight bold :inherit gnus-group-mail-low-empty))))
- `(gnus-group-mail-low-empty-face ((,class (:inherit gnus-group-news-low-empty))))
- `(gnus-group-news-1-face ((,class (:weight bold :inherit gnus-group-news-1-empty))))
- `(gnus-group-news-2-face ((,class (:weight bold :inherit gnus-group-news-2-empty))))
- `(gnus-group-news-3-face ((,class (:weight bold :inherit gnus-group-news-3-empty))))
- `(gnus-group-news-4-face ((,class (:weight bold :inherit gnus-group-news-4-empty))))
- `(gnus-group-news-5-face ((,class (:weight bold :inherit gnus-group-news-5-empty))))
- `(gnus-group-news-6-face ((,class (:weight bold :inherit gnus-group-news-6-empty))))
- `(gnus-group-news-low-face ((,class (:weight bold :inherit gnus-group-news-low-empty))))
+ `(gnus-group-mail-1 ((,class (:weight bold :inherit gnus-group-mail-1-empty))))
+ `(gnus-group-mail-1-empty ((,class (:inherit gnus-group-news-1-empty))))
+ `(gnus-group-mail-2 ((,class (:weight bold :inherit gnus-group-mail-2-empty))))
+ `(gnus-group-mail-2-empty ((,class (:inherit gnus-group-news-2-empty))))
+ `(gnus-group-mail-3 ((,class (:weight bold :inherit gnus-group-mail-3-empty))))
+ `(gnus-group-mail-3-empty ((,class (:inherit gnus-group-news-3-empty))))
+ `(gnus-group-mail-low ((,class (:weight bold :inherit gnus-group-mail-low-empty))))
+ `(gnus-group-mail-low-empty ((,class (:inherit gnus-group-news-low-empty))))
+ `(gnus-group-news-1 ((,class (:weight bold :inherit gnus-group-news-1-empty))))
+ `(gnus-group-news-2 ((,class (:weight bold :inherit gnus-group-news-2-empty))))
+ `(gnus-group-news-3 ((,class (:weight bold :inherit gnus-group-news-3-empty))))
+ `(gnus-group-news-4 ((,class (:weight bold :inherit gnus-group-news-4-empty))))
+ `(gnus-group-news-5 ((,class (:weight bold :inherit gnus-group-news-5-empty))))
+ `(gnus-group-news-6 ((,class (:weight bold :inherit gnus-group-news-6-empty))))
+ `(gnus-group-news-low ((,class (:weight bold :inherit gnus-group-news-low-empty))))
`(gnus-header-content-face ((,class (:inherit message-header-other))))
- `(gnus-header-from-face ((,class (:inherit message-header-from))))
+ `(gnus-header-from-face ((,class (:inherit message-header-other))))
`(gnus-header-name-face ((,class (:inherit message-header-name))))
`(gnus-header-newsgroups-face ((,class (:inherit message-header-other))))
`(gnus-header-subject-face ((,class (:inherit message-header-subject))))
@@ -546,14 +541,14 @@
`(gnus-summary-high-read-face ((,class (:foreground ,green :weight bold))))
`(gnus-summary-high-ticked-face ((,class (:foreground ,orange :weight bold))))
`(gnus-summary-high-unread-face ((,class (:foreground ,solarized-fg :weight bold))))
- `(gnus-summary-low-ancient-face ((,class (:foreground ,blue))))
- `(gnus-summary-low-read-face ((t (:foreground ,green))))
- `(gnus-summary-low-ticked-face ((,class (:foreground ,orange :weight bold))))
- `(gnus-summary-low-unread-face ((,class (:foreground ,solarized-fg))))
- `(gnus-summary-normal-ancient-face ((,class (:foreground ,blue))))
- `(gnus-summary-normal-read-face ((,class (:foreground ,green))))
- `(gnus-summary-normal-ticked-face ((,class (:foreground ,orange :weight bold))))
- `(gnus-summary-normal-unread-face ((,class (:foreground ,solarized-fg))))
+ `(gnus-summary-low-ancient ((,class (:foreground ,blue))))
+ `(gnus-summary-low-read ((t (:foreground ,green))))
+ `(gnus-summary-low-ticked ((,class (:foreground ,orange :weight bold))))
+ `(gnus-summary-low-unread ((,class (:foreground ,solarized-fg))))
+ `(gnus-summary-normal-ancient ((,class (:foreground ,blue))))
+ `(gnus-summary-normal-read ((,class (:foreground ,green))))
+ `(gnus-summary-normal-ticked ((,class (:foreground ,orange :weight bold))))
+ `(gnus-summary-normal-unread ((,class (:foreground ,solarized-fg))))
`(gnus-summary-selected-face ((,class (:foreground ,yellow :weight bold))))
`(gnus-cite-1-face ((,class (:foreground ,blue))))
`(gnus-cite-10-face ((,class (:foreground ,yellow))))
@@ -566,14 +561,14 @@
`(gnus-cite-7-face ((,class (:foreground ,red))))
`(gnus-cite-8-face ((,class (:foreground ,red))))
`(gnus-cite-9-face ((,class (:foreground ,red))))
- `(gnus-group-news-1-empty-face ((,class (:foreground ,yellow))))
- `(gnus-group-news-2-empty-face ((,class (:foreground ,green))))
- `(gnus-group-news-3-empty-face ((,class (:foreground ,green))))
- `(gnus-group-news-4-empty-face ((,class (:foreground ,blue))))
- `(gnus-group-news-5-empty-face ((,class (:foreground ,blue))))
- `(gnus-group-news-6-empty-face ((,class (:foreground ,solarized-bg))))
- `(gnus-group-news-low-empty-face ((,class (:foreground ,solarized-bg))))
- `(gnus-signature-face ((,class (:foreground ,yellow))))
+ `(gnus-group-news-1-empty ((,class (:foreground ,yellow))))
+ `(gnus-group-news-2-empty ((,class (:foreground ,green))))
+ `(gnus-group-news-3-empty ((,class (:foreground ,green))))
+ `(gnus-group-news-4-empty ((,class (:foreground ,blue))))
+ `(gnus-group-news-5-empty ((,class (:foreground ,blue))))
+ `(gnus-group-news-6-empty ((,class (:foreground ,solarized-bg))))
+ `(gnus-group-news-low-empty ((,class (:foreground ,solarized-bg))))
+ `(gnus-signature ((,class (:foreground ,yellow))))
`(gnus-x-face ((,class (:background ,solarized-fg :foreground ,solarized-bg))))
;; helm (these probably needs tweaking)
@@ -879,7 +874,7 @@
`(org-drawer ((,class (:foreground ,cyan))))
`(org-footnote ((,class (:foreground ,magenta :underline t))))
`(org-latex-and-export-specials ((,class (:foreground ,orange))))
- `(org-mode-line-clock-overrun ((,class (:inherit modeline :background ,red))))
+ `(org-mode-line-clock-overrun ((,class (:inherit mode-line :background ,red))))
;; outline
`(outline-1 ((,class (:inherit org-level-1))))
