From 767b1a8a28e7c791d629b368d7a76d092e2f40c3 Mon Sep 17 00:00:00 2001 From: Benjamin Kudria Date: Fri, 15 Apr 2011 13:44:57 -0700 Subject: [PATCH 1/5] Magit color support --- color-theme-solarized.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/color-theme-solarized.el b/color-theme-solarized.el index 01d065c..fc0fe1c 100755 --- a/color-theme-solarized.el +++ b/color-theme-solarized.el @@ -128,6 +128,14 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized." (diff-file-header ((t (:background ,base1 :foreground ,base01 :bold t)))) (diff-refine-change ((t (:background ,base1)))) + ;; magit + (magit-file-header ((t (:foreground ,violet)))) + (magit-hunk-header ((t (:foreground ,blue)))) + (magit-header ((t (:foreground ,cyan)))) + (magit-tag-label ((t (:background ,blue :foreground ,orange)))) + (magit-diff-add ((t (:foreground ,blue)))) + (magit-diff-del ((t (:foreground ,red)))) + (magit-item-highlight ((t (:background ,base02)))) ;; emacs-wiki (emacs-wiki-bad-link-face ((t (:foreground ,red :underline t)))) (emacs-wiki-link-face ((t (:foreground ,blue :underline t)))) From 5c24edf597bbcdb2eb59ae6c0b06a904e8675513 Mon Sep 17 00:00:00 2001 From: Benjamin Kudria Date: Fri, 15 Apr 2011 13:45:15 -0700 Subject: [PATCH 2/5] Extended font-lock color support --- color-theme-solarized.el | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/color-theme-solarized.el b/color-theme-solarized.el index fc0fe1c..87105eb 100755 --- a/color-theme-solarized.el +++ b/color-theme-solarized.el @@ -151,6 +151,19 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized." (font-lock-variable-name-face ((t (:foreground ,blue)))) (font-lock-warning-face ((t (:foreground ,red :bold t)))) (font-lock-doc-face ((t (:foreground ,cyan :italic t)))) + (font-lock-color-constant-face ((t (:foreground ,green)))) + (font-lock-comment-delimiter-face ((t (:foreground ,base01 :bold t)))) + (font-lock-doc-string-face ((t (:foreground ,green)))) + (font-lock-preprocessor-face ((t (:foreground ,orange)))) + (font-lock-reference-face ((t (:foreground ,cyan)))) + (font-lock-negation-char-face ((t (:foreground ,red)))) + (font-lock-other-type-face ((t (:foreground ,blue :italic t)))) + (font-lock-regexp-grouping-construct ((t (:foreground ,orange)))) + (font-lock-special-keyword-face ((t (:foreground ,magenta)))) + (font-lock-exit-face ((t (:foreground ,red)))) + (font-lock-other-emphasized-face ((t (:foreground ,violet :bold t :italic t)))) + (font-lock-regexp-grouping-backslash ((t (:foreground ,yellow)))) + ;; info (info-xref ((t (:foreground ,blue :underline t)))) (info-xref-visited ((t (:inherit info-xref :foreground ,magenta)))) From 928309a2b2e697efd08b66cfc210567901b62700 Mon Sep 17 00:00:00 2001 From: Benjamin Kudria Date: Fri, 15 Apr 2011 13:45:40 -0700 Subject: [PATCH 3/5] Flymake color support --- color-theme-solarized.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/color-theme-solarized.el b/color-theme-solarized.el index 87105eb..9fc6f12 100755 --- a/color-theme-solarized.el +++ b/color-theme-solarized.el @@ -225,6 +225,9 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized." (gnus-summary-normal-read ((t (:foreground ,base1)))) (gnus-summary-normal-ticked ((t (:foreground ,base3)))) (gnus-summary-normal-undownloaded ((t (:foreground ,base2)))) + ;; Flymake + (flymake-errline ((t (:background ,orange)))) + (flymake-warnline ((t (:background ,violet)))) ;; Message (message-mml ((t (:foreground ,blue)))) (message-cited-text ((t (:foreground ,base2)))) From a5ff4036b803d07f8315ce6cae10851815912230 Mon Sep 17 00:00:00 2001 From: Benjamin Kudria Date: Fri, 15 Apr 2011 13:48:17 -0700 Subject: [PATCH 4/5] Whitespace highlighting support --- color-theme-solarized.el | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/color-theme-solarized.el b/color-theme-solarized.el index 9fc6f12..c722aad 100755 --- a/color-theme-solarized.el +++ b/color-theme-solarized.el @@ -228,6 +228,16 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized." ;; Flymake (flymake-errline ((t (:background ,orange)))) (flymake-warnline ((t (:background ,violet)))) + ;; whitespace + (whitespace-empty ((t (:foreground ,red)))) + (whitespace-hspace ((t (:foreground ,orange)))) + (whitespace-indentation ((t (:foreground ,base02)))) + (whitespace-space ((t (:foreground ,base02)))) + (whitespace-space-after-tab ((t (:foreground ,cyan)))) + (whitespace-space-before-tab ((t (:foreground ,red :bold t)))) + (whitespace-tab ((t (:foreground ,base02)))) + (whitespace-trailing ((t (:background ,base02 :foreground ,red :bold t)))) + (whitespace-highlight-face ((t (:background ,blue :foreground ,red)))) ;; Message (message-mml ((t (:foreground ,blue)))) (message-cited-text ((t (:foreground ,base2)))) From 881a5559b3beccbfb16d6c178d1ce6ad82480bb0 Mon Sep 17 00:00:00 2001 From: Benjamin Kudria Date: Fri, 15 Apr 2011 13:48:38 -0700 Subject: [PATCH 5/5] Misc highlighting support --- color-theme-solarized.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/color-theme-solarized.el b/color-theme-solarized.el index c722aad..366b8e7 100755 --- a/color-theme-solarized.el +++ b/color-theme-solarized.el @@ -86,6 +86,7 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized." (fringe ((t (:foreground ,base01 :background ,base02)))) (header-line ((t (:foreground ,base0 :background ,base2)))) (highlight ((t (:background ,base02)))) + (lazy-highlight ((t (:background ,base01)))) (isearch ((t (:foreground ,yellow :inverse-video t)))) (menu ((t (:foreground ,base0 :background ,base02)))) (minibuffer-prompt ((t (:foreground ,blue)))) @@ -100,6 +101,7 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized." (secondary-selection ((t (:background ,base02)))) (trailing-whitespace ((t (:foreground ,red :inverse-video t)))) (vertical-border ((t (:foreground ,base0)))) + (hl-line ((t (:background ,base02)))) ;; comint (comint-highlight-prompt ((t (:foreground ,blue)))) ;; compilation