# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1449504887 0
# Node ID aba55453ddedaaf88b4087ccc7f90c06e3c9210e
# Parent  f95004797b0d0d487a00d2425d9974ddfdf5aa70# Parent  95932d3d5b93f97b6968d17001a972b5fed5940b
Merge.

diff -r 95932d3d5b93 -r aba55453dded colors/badwolf.vim
--- a/colors/badwolf.vim	Wed Sep 04 16:03:47 2013 +0200
+++ b/colors/badwolf.vim	Mon Dec 07 16:14:47 2015 +0000
@@ -443,6 +443,13 @@
 call s:HL('clojureAnonArg', 'snow', '', 'bold')
 
 " }}}
+" Common Lisp {{{
+
+call s:HL('lispFunc',           'lime', '', 'none')
+call s:HL('lispVar',            'orange', '', 'bold')
+call s:HL('lispEscapeSpecial',  'orange', '', 'none')
+
+" }}}
 " CSS {{{
 
 if g:badwolf_css_props_highlight
diff -r 95932d3d5b93 -r aba55453dded contrib/badwolf-theme.el
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/badwolf-theme.el	Mon Dec 07 16:14:47 2015 +0000
@@ -0,0 +1,108 @@
+(deftheme badwolf "Badwolf color Theme")
+
+(let ((class '((class color) (min-colors 89)))
+     ;;Badwolf pallete
+    (bwc-plain "#f8f6f2")
+    (bwc-snow "#ffffff")
+    (bwc-coal "#000000")
+
+    (bwc-brightgravel "#d9cec3")
+    (bwc-lightgravel "#998f84")
+    (bwc-gravel "#857f78")
+    (bwc-mediumgravel "#666462")
+    (bwc-deepgravel "#45413b")
+    (bwc-deepergravel "#35322d")
+    (bwc-darkgravel "#242321")
+    (bwc-blackgravel "#1c1b1a")
+    (bwc-blackestgravel "#141413")
+
+    (bwc-dalespale "#fade3e")
+    (bwc-dirtyblonde "#f4cf86")
+    ; (bwc-taffy "#ff2c4b")
+    (bwc-taffy "#ff0208")
+    (bwc-saltwatertaffy "#8cffba")
+    (bwc-tardis "#0a9dff")
+    (bwc-orange "#ffa724")
+    (bwc-lime "#aeee00")
+    (bwc-dress "#ff9eb8")
+    (bwc-toffee "#b88853")
+    (bwc-coffee "#c7915b")
+    (bwc-darkroast "#88633f")
+    )
+
+  ;; theme faces
+  (custom-theme-set-faces
+   'badwolf
+   `(default ((t (:inherit nil :foreground ,bwc-plain :background ,bwc-blackestgravel))))
+   `(cursor ((t (:background ,bwc-tardis))))
+   `(region ((t (:foreground nil :background ,bwc-mediumgravel ))))
+   `(fringe ((t (:background ,bwc-blackestgravel))))
+
+   `(minibuffer-prompt ((t (:foreground ,bwc-lime))))
+   `(link ((t (:foreground ,bwc-lightgravel :underline t))))
+   `(link-visited ((t (:inherit link :foreground ,bwc-orange))))
+
+   `(highlight ((t (:foreground ,bwc-coal :background ,bwc-dalespale))))
+   `(hl-line ((t (:inherit nil :background ,bwc-darkgravel))))
+
+   `(linum ((t (:foreground ,bwc-mediumgravel))))
+
+   `(isearch ((t (:foreground ,bwc-coal :background ,bwc-dalespale :weight bold))))
+   `(lazy-highlight ((t (:foreground ,bwc-coal :background, bwc-dalespale :weight bold))))
+
+   `(mode-line ((t (:box (:line-width -1 :style released-button) :foreground ,bwc-brightgravel :background ,bwc-darkgravel))))
+   `(mode-line-inactive ((t (:box (:line-width -1 :style released-button) :foreground ,bwc-snow :background ,bwc-deepgravel))))
+
+
+   `(font-lock-comment-face ((t (:foreground ,bwc-lightgravel))))
+   `(font-lock-comment-delimiter-face ((t (:foreground ,bwc-lightgravel))))
+   `(font-lock-doc-face ((t (:foreground ,bwc-snow))))
+   `(font-lock-string-face ((t (:foreground ,bwc-dirtyblonde))))
+   `(font-lock-function-name-face ((t (:foreground ,bwc-orange))))
+   `(font-lock-variable-name-face ((t (:foreground ,bwc-dress))))
+   `(font-lock-builtin-face ((t (:foreground ,bwc-taffy :weight bold))))
+   `(font-lock-keyword-face ((t (:foreground ,bwc-taffy :weight bold))))
+   `(font-lock-type-face ((t (:foreground ,bwc-dress))))
+   `(font-lock-constant-face ((t (:foreground ,bwc-orange))))
+   `(font-lock-warning-face ((t (:foreground ,bwc-dress :weight bold))))
+
+  `(show-paren-match ((t (:background ,bwc-tardis :weight bold))))
+  `(show-paren-mismatch ((t (:background ,bwc-taffy :weight bold))))
+
+    ;; rainbow-delimiters
+   `(rainbow-delimiters-depth-1-face ((t (:foreground ,bwc-lightgravel))))
+   `(rainbow-delimiters-depth-2-face ((t (:foreground ,bwc-orange))))
+   `(rainbow-delimiters-depth-3-face ((t (:foreground ,bwc-saltwatertaffy))))
+   `(rainbow-delimiters-depth-4-face ((t (:foreground ,bwc-dress))))
+   `(rainbow-delimiters-depth-5-face ((t (:foreground ,bwc-coffee))))
+   `(rainbow-delimiters-depth-6-face ((t (:foreground ,bwc-dirtyblonde))))
+   `(rainbow-delimiters-depth-7-face ((t (:foreground ,bwc-orange))))
+   `(rainbow-delimiters-depth-8-face ((t (:foreground ,bwc-saltwatertaffy)))
+   `(rainbow-delimiters-depth-9-face ((t (:foreground ,bwc-dress))))
+   `(rainbow-delimiters-depth-10-face ((t (:foreground ,bwc-coffee))))
+   `(rainbow-delimiters-depth-11-face ((t (:foreground ,bwc-dirtyblonde))))
+   `(rainbow-delimiters-unmatched-face ((t (:foreground "red"))))
+
+
+
+
+   ))
+
+    (custom-set-faces
+     `(ein:cell-input-area ((t (:background ,bwc-blackestgravel :inherit nil))))
+     `(ein:cell-input-prompt ((t (:foreground ,bwc-orange :background nil :inherit nil))))
+     `(ein:cell-output-prompt ((t (:foreground ,bwc-taffy :background nil :inherit nil))))
+     '(mumamo-background-chunk-major ((((class color) (min-colors 88) (background dark)) nil)))
+
+     `(ac-candidate-face ((t (:background ,bwc-lightgravel))))
+     `(ac-selection-face ((t (:foreground ,bwc-coal :background ,bwc-orange))))
+
+      `(flymake-errline ((t (:background nil :underline ,bwc-taffy ))))
+      `(flymake-warnline ((t (:background nil :underline ,bwc-dress ))))
+     )
+
+
+    (font-lock-add-keywords 'python-mode `(("\\<\\(import\\||from\\|except\\|finally\\|try\\|from\\|\\)\\>" 1 '(:foreground ,bwc-lime ) t)))
+  )
+
+(provide-theme 'badwolf)