solarized-emacs

a fork of Bozhidar Batsov's solarized-emacs
git clone https://git.trogloxene.org/solarized-emacs.git
Log | Files | Refs | README

commit 6d1f7a4b47925a46f16080030a5a671c4ed6a4fb
parent 864f7ce98c0184b8d36aaae696c0c4a20699e535
Author: Bozhidar Batsov <bozhidar.batsov@gmail.com>
Date:   Thu, 19 Apr 2012 07:40:26 -0700

Merge pull request #23 from thomasf/misc-01

Several changes.
Diffstat:
MREADME.md | 4+++-
Msolarized-theme.el | 33++++++++++++++++++++++++++-------
2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md @@ -51,4 +51,6 @@ GitHub pull request. # Contributors -So far - none. You could be the first. :-) +- [Thomas Frössman](http://t.jossystem.se) + +(Add yourself to the list) diff --git a/solarized-theme.el b/solarized-theme.el @@ -1,8 +1,8 @@ ;;; solarized-theme.el --- Solarized for Emacs. -;; Copyright (C) 2011 Bozhidar Batsov +;; Copyright (C) 2011,2012 Bozhidar Batsov -;; Author: Bozhidar Batsov <bozhidar.batsov@gmail.com> +;; Authors: Bozhidar Batsov <bozhidar.batsov@gmail.com>, Thomas Frössman <thomasf@jossystem.se> ;; URL: http://github.com/bbatsov/solarized-emacs ;; Version: 0.3.0 @@ -147,7 +147,7 @@ `(grep-error-face ((,class (:foreground ,red :weight bold :underline t)))) `(grep-hit-face ((,class (:foreground ,blue)))) `(grep-match-face ((,class (:foreground ,orange :weight bold)))) - `(match ((,class (:background ,solarized-hl :foreground ,orange :weight bold)))) + `(match ((,class (:background ,solarized-hl :foreground ,solarized-emph :weight bold)))) ;; faces used by isearch `(isearch ((,class (:foreground ,yellow :background ,solarized-hl)))) @@ -196,6 +196,12 @@ `(ace-jump-face-foreground ((,class (:foreground ,red :background ,solarized-bg :inverse-video nil)))) + ;; custom + `(custom-variable-tag ((,class (:foreground ,cyan)))) + `(custom-comment-tag ((,class (:foreground ,solarized-comments)))) + `(custom-group-tag ((,class (:foreground ,blue)))) + `(custom-state ((,class (:foreground ,green)))) + ;; diff `(diff-added ((,class (:foreground ,green)))) `(diff-changed ((,class (:foreground ,yellow)))) @@ -218,8 +224,9 @@ `(eshell-ls-symlink ((,class (:foreground ,cyan :weight bold)))) ;; flymake - `(flymake-errline ((,class (:foreground ,red :weight bold :underline t)))) - `(flymake-warnline ((,class (:foreground ,yellow :weight bold :underline t)))) + `(flymake-errline ((,class (:foreground ,red-hc :background ,red-lc :weight bold :underline t)))) + `(flymake-infoline ((,class (:foreground ,green-hc :background ,green-lc)))) + `(flymake-warnline ((,class (:foreground ,yellow-hc :background ,yellow-lc :weight bold :underline t)))) ;; flyspell `(flyspell-duplicate ((,class (:foreground ,yellow :weight bold :underline t)))) @@ -308,6 +315,17 @@ `(gnus-signature-face ((,class (:foreground ,yellow)))) `(gnus-x-face ((,class (:background ,solarized-fg :foreground ,solarized-bg)))) + ;; hi-lock-mode + `(hi-yellow ((,class (:foreground ,yellow-lc :background ,yellow-hc)))) + `(hi-pink ((,class (:foreground ,magenta-lc :background ,magenta-hc)))) + `(hi-green ((,class (:foreground ,green-lc :background ,green-hc)))) + `(hi-blue ((,class (:foreground ,blue-lc :background ,blue-hc)))) + `(hi-black-b ((,class (:foreground ,solarized-emph :background ,solarized-bg :weight bold)))) + `(hi-blue-b ((,class (:foreground ,blue-lc :weight bold)))) + `(hi-green-b ((,class (:foreground ,green-lc :weight bold)))) + `(hi-red-b ((,class (:foreground ,red :weight bold)))) + `(hi-black-hb ((,class (:foreground ,solarized-emph :background ,solarized-bg :weight bold)))) + ;; hl-line-mode `(hl-line-face ((,class (:background ,solarized-bg)))) @@ -403,6 +421,7 @@ `(org-level-7 ((,class (:foreground ,red)))) `(org-level-8 ((,class (:foreground ,blue)))) `(org-link ((,class (:foreground ,yellow :underline t)))) + `(org-sexp-date ((,class (:foreground ,violet)))) `(org-scheduled ((,class (:foreground ,green)))) `(org-scheduled-previously ((,class (:foreground ,orange)))) `(org-scheduled-today ((,class (:bold t :foreground ,blue :weight bold)))) @@ -418,9 +437,9 @@ `(org-habit-clear-future-face ((,class (:background ,blue-lc)))) `(org-habit-ready-face ((,class (:background ,green-lc :foreground ,green)))) `(org-habit-ready-future-face ((,class (:background ,green-lc)))) - `(org-habit-alert-face ((,class (:background ,yellow-hc :foreground ,yellow-lc)))) + `(org-habit-alert-face ((,class (:background ,yellow :foreground ,yellow-lc)))) `(org-habit-alert-future-face ((,class (:background ,yellow-lc)))) - `(org-habit-overdue-face ((,class (:background ,red-hc :foreground ,red-lc)))) + `(org-habit-overdue-face ((,class (:background ,red :foreground ,red-lc)))) `(org-habit-overdue-future-face ((,class (:background ,red-lc)))) ;; outline