update solarized

diff --git a/.emacs.d/elisp/local/solarized.el b/.emacs.d/elisp/local/solarized.el
index 312c2e8..1726628 100644 (file)
--- a/.emacs.d/elisp/local/solarized.el
+++ b/.emacs.d/elisp/local/solarized.el
@@ -299,6 +299,13 @@
      `(clojure-test-error-face ((t (:foreground ,red :weight bold :underline t))))
      `(clojure-test-success-face ((t (:foreground ,green :weight bold :underline t))))
 
+     ;; cscope
+     `(cscope-file-face ((,class (:foreground ,green :weight bold))))
+     `(cscope-function-face ((,class (:foreground ,blue))))
+     `(cscope-line-number-face ((,class (:foreground ,yellow))))
+     `(cscope-line-face ((,class (:foreground ,solarized-fg))))
+     `(cscope-mouse-face ((,class (:background ,blue :foreground ,solarized-fg))))
+
      ;; ctable
      `(ctbl:face-cell-select ((,class (:background ,blue :foreground ,solarized-bg))))
      `(ctbl:face-continue-bar ((,class (:background ,solarized-hl :foreground ,solarized-bg))))
@@ -316,11 +323,14 @@
 
      ;; diff
      `(diff-added ((,class (:foreground ,green :background ,solarized-bg))))
-     `(diff-changed ((,class (:foreground ,yellow :background ,solarized-bg))))
+     `(diff-changed ((,class (:foreground ,blue :background ,solarized-bg))))
      `(diff-removed ((,class (:foreground ,red :background ,solarized-bg))))
      `(diff-header ((,class (:background ,solarized-bg))))
      `(diff-file-header
        ((,class (:background ,solarized-bg :foreground ,solarized-fg :weight bold))))
+     `(diff-refine-added ((,class :foreground ,solarized-bg :background ,green)))
+     `(diff-refine-change ((,class :foreground ,solarized-bg :background ,blue)))
+     `(diff-refine-removed ((,class (:foreground ,solarized-bg :background ,red))))
 
      ;; ediff
      `(ediff-fine-diff-A ((,class (:background ,orange-lc))))
@@ -352,20 +362,41 @@
 
      ;; flymake
      `(flymake-errline
-       ((,class (:foreground ,red-hc :background ,red-lc :weight bold :underline t))))
-     `(flymake-infoline ((,class (:foreground ,green-hc :background ,green-lc))))
+       ((,(append '((supports :underline (:style wave))) class)
+         (:underline (:style wave :color ,red)))
+        (,class (:foreground ,red-hc :background ,red-lc :weight bold :underline t))))
+     `(flymake-infoline
+       ((,(append '((supports :underline (:style wave))) class)
+         (:underline (:style wave :color ,green)))
+        (,class (:foreground ,green-hc :background ,green-lc))))
      `(flymake-warnline
-       ((,class (:foreground ,yellow-hc :background ,yellow-lc :weight bold :underline t))))
+       ((,(append '((supports :underline (:style wave))) class)
+         (:underline (:style wave :color ,yellow)))
+        (,class (:foreground ,yellow-hc :background ,yellow-lc :weight bold :underline t))))
 
      ;; flycheck
-     `(flycheck-error-face
-       ((,class (:foreground ,red-hc :background ,red-lc :weight bold :underline t))))
-     `(flycheck-warning-face
-       ((,class (:foreground ,yellow-hc :background ,yellow-lc :weight bold :underline t))))
+     `(flycheck-error
+       ((,(append '((supports :underline (:style wave))) class)
+         (:underline (:style wave :color ,red)))
+        (,class (:foreground ,red-hc :background ,red-lc :weight bold :underline t))))
+     `(flycheck-warning
+       ((,(append '((supports :underline (:style wave))) class)
+         (:underline (:style wave :color ,yellow)))
+        (,class (:foreground ,yellow-hc :background ,yellow-lc :weight bold :underline t))))
+     `(flycheck-fringe-error
+       ((,class (:foreground ,red-hc :background ,red-lc :weight bold))))
+     `(flycheck-fringe-warning
+       ((,class (:foreground ,yellow-hc :background ,yellow-lc :weight bold))))
 
      ;; flyspell
-     `(flyspell-duplicate ((,class (:foreground ,yellow :weight bold :underline t))))
-     `(flyspell-incorrect ((,class (:foreground ,red :weight bold :underline t))))
+     `(flyspell-duplicate
+       ((,(append '((supports :underline (:style wave))) class)
+         (:underline (:style wave :color ,yellow)))
+        (,class (:foreground ,yellow :weight bold :underline t))))
+     `(flyspell-incorrect
+       ((,(append '((supports :underline (:style wave))) class)
+         (:underline (:style wave :color ,red)))
+        (,class (:foreground ,red :weight bold :underline t))))
 
      ;; erc
      `(erc-action-face ((,class (:inherit erc-default-face))))
@@ -581,7 +612,13 @@
      `(jedi:highlight-function-argument ((,class (:inherit bold))))
 
      ;; linum-mode
-     `(linum ((,class (:foreground ,green-d :background ,solarized-bg))))
+     `(linum ((,class (:foreground ,solarized-fg :background ,solarized-bg))))
+
+     ;; lusty-explorer
+     `(lusty-directory-face ((,class (:inherit dired-directory))))
+     `(lusty-file-face ((,class nil)))
+     `(lusty-match-face ((,class (:inherit ido-first-match))))
+     `(lusty-slash-face ((,class (:foreground ,cyan :weight bold))))
 
      ;; magit
      `(magit-section-title ((,class (:foreground ,yellow :weight bold))))
@@ -757,14 +794,14 @@
      `(org-mode-line-clock-overrun ((,class (:inherit modeline :background ,red))))
 
      ;; outline
-     `(outline-8 ((,class (:inherit default))))
-     `(outline-7 ((,class (:inherit outline-8 :height 1.0))))
-     `(outline-6 ((,class (:inherit outline-7 :height 1.0))))
-     `(outline-5 ((,class (:inherit outline-6 :height 1.0))))
-     `(outline-4 ((,class (:inherit outline-5 :height 1.0))))
-     `(outline-3 ((,class (:inherit outline-4 :height 1.0))))
-     `(outline-2 ((,class (:inherit outline-3 :height 1.0))))
-     `(outline-1 ((,class (:inherit outline-2 :height 1.0))))
+     `(outline-1 ((,class (:inherit org-level-1))))
+     `(outline-2 ((,class (:inherit org-level-2))))
+     `(outline-3 ((,class (:inherit org-level-3))))
+     `(outline-4 ((,class (:inherit org-level-4))))
+     `(outline-5 ((,class (:inherit org-level-5))))
+     `(outline-6 ((,class (:inherit org-level-6))))
+     `(outline-7 ((,class (:inherit org-level-7))))
+     `(outline-8 ((,class (:inherit org-level-8))))
 
      ;; pretty-mode
      `(pretty-mode-symbol-face  ((,class (:foreground ,green))))
@@ -823,6 +860,11 @@
      `(sp-pair-overlay-face ((,class (:background ,solarized-hl))))
      `(sp-wrap-overlay-face ((,class (:background ,solarized-hl))))
      `(sp-wrap-tag-overlay-face ((,class (:background ,solarized-hl))))
+     `(sp-show-pair-enclosing ((,class (:inherit highlight))))
+     `(sp-show-pair-match-face
+       ((,class (:foreground ,cyan :background ,solarized-bg :weight normal :inverse-video t))))
+     `(sp-show-pair-mismatch-face
+       ((,class (:foreground ,red :background ,solarized-bg :weight normal :inverse-video t))))
 
      ;; show-paren
      `(show-paren-match
@@ -1089,6 +1131,7 @@
 
 ;; Local Variables:
 ;; no-byte-compile: t
+;; eval: (when (fboundp 'rainbow-mode) (rainbow-mode 1))
 ;; End:
 
 (provide 'solarized)