# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1449504731 0
# Node ID f95004797b0d0d487a00d2425d9974ddfdf5aa70
# Parent  22156d26f2e30050d2e240d5109e5ec5f4dec4b4# Parent  ad4632b3eb3d7ef3aff4aa442160d3d94b11fdf6
Merge.

diff -r ad4632b3eb3d -r f95004797b0d .hgignore
--- a/.hgignore	Mon Jul 15 09:11:21 2013 -0400
+++ b/.hgignore	Mon Dec 07 16:12:11 2015 +0000
@@ -8,3 +8,4 @@
 *~
 .ropeproject
 tags
+tags.bak
diff -r ad4632b3eb3d -r f95004797b0d .hgtags
--- a/.hgtags	Mon Jul 15 09:11:21 2013 -0400
+++ b/.hgtags	Mon Dec 07 16:12:11 2015 +0000
@@ -5,3 +5,4 @@
 8c3583c971acda5cb4f034dbe643e5a9315db63b v1.2.0
 4e6ee97af8b02741af86dcb2eb3f0f4dbbcc9761 v1.3.0
 5b17fcb91dd54bff3987513ece727b45105b15fc v1.4.0
+2ef3532a6301313f323067bba6b6d445d0f332c5 v1.5.0
diff -r ad4632b3eb3d -r f95004797b0d README.markdown
--- a/README.markdown	Mon Jul 15 09:11:21 2013 -0400
+++ b/README.markdown	Mon Dec 07 16:12:11 2015 +0000
@@ -40,6 +40,37 @@
 
 There are a few settings you can use to tweak how Bad Wolf looks.
 
+### g:badwolf\_darkgutter
+
+Determines whether the line number, sign column, and fold column are rendered
+darker than the normal background, or the same.
+
+    " Make the gutters darker than the background.
+    let g:badwolf_darkgutter = 1
+
+Default: `0` (off, gutters are the same as the background)
+
+### g:badwolf\_tabline
+
+Determines how light to render the background of the tab line (the line at the
+top of the screen containing the various tabs (only in console mode)).
+
+Can be set to `0`, `1`, `2`, or `3`.
+
+    " Make the tab line darker than the background.
+    let g:badwolf_tabline = 0
+
+    " Make the tab line the same color as the background.
+    let g:badwolf_tabline = 1
+
+    " Make the tab line lighter than the background.
+    let g:badwolf_tabline = 2
+
+    " Make the tab line much lighter than the background.
+    let g:badwolf_tabline = 3
+
+Default: `1` (same color as the background)
+
 ### g:badwolf\_html\_link\_underline
 
 Determines whether text inside `a` tags in HTML files will be underlined.
diff -r ad4632b3eb3d -r f95004797b0d colors/badwolf.vim
--- a/colors/badwolf.vim	Mon Jul 15 09:11:21 2013 -0400
+++ b/colors/badwolf.vim	Mon Dec 07 16:12:11 2015 +0000
@@ -154,6 +154,22 @@
     let s:gutter = 'blackgravel'
 endif
 
+if exists('g:badwolf_tabline')
+    if g:badwolf_tabline == 0
+        let s:tabline = 'blackestgravel'
+    elseif  g:badwolf_tabline == 1
+        let s:tabline = 'blackgravel'
+    elseif  g:badwolf_tabline == 2
+        let s:tabline = 'darkgravel'
+    elseif  g:badwolf_tabline == 3
+        let s:tabline = 'deepgravel'
+    else
+        let s:tabline = 'blackestgravel'
+    endif
+else
+    let s:tabline = 'blackgravel'
+endif
+
 " }}}
 
 " Actual colorscheme ----------------------------------------------------------
@@ -171,6 +187,10 @@
 call s:HL('CursorColumn', '', 'darkgravel')
 call s:HL('ColorColumn',  '', 'darkgravel')
 
+call s:HL('TabLine', 'plain', s:tabline, 'none')
+call s:HL('TabLineFill', 'plain', s:tabline, 'none')
+call s:HL('TabLineSel', 'coal', 'tardis', 'none')
+
 call s:HL('MatchParen', 'dalespale', 'darkgravel', 'bold')
 
 call s:HL('NonText',    'deepgravel', 'bg')
@@ -359,7 +379,11 @@
 " from my Vimrc.
 call s:HL('InterestingWord1', 'coal', 'orange')
 call s:HL('InterestingWord2', 'coal', 'lime')
-call s:HL('InterestingWord3', 'coal', 'taffy')
+call s:HL('InterestingWord3', 'coal', 'saltwatertaffy')
+call s:HL('InterestingWord4', 'coal', 'toffee')
+call s:HL('InterestingWord5', 'coal', 'dress')
+call s:HL('InterestingWord6', 'coal', 'taffy')
+
 
 " }}}
 " Makegreen {{{
@@ -368,6 +392,26 @@
 " hi RedBar   term=reverse ctermfg=white ctermbg=red guifg=white guibg=#C50048
 
 " }}}
+" Rainbow Parentheses {{{
+
+call s:HL('level16c', 'mediumgravel',   '', 'bold')
+call s:HL('level15c', 'dalespale',      '', '')
+call s:HL('level14c', 'dress',          '', '')
+call s:HL('level13c', 'orange',         '', '')
+call s:HL('level12c', 'tardis',         '', '')
+call s:HL('level11c', 'lime',           '', '')
+call s:HL('level10c', 'toffee',         '', '')
+call s:HL('level9c',  'saltwatertaffy', '', '')
+call s:HL('level8c',  'coffee',         '', '')
+call s:HL('level7c',  'dalespale',      '', '')
+call s:HL('level6c',  'dress',          '', '')
+call s:HL('level5c',  'orange',         '', '')
+call s:HL('level4c',  'tardis',         '', '')
+call s:HL('level3c',  'lime',           '', '')
+call s:HL('level2c',  'toffee',         '', '')
+call s:HL('level1c',  'saltwatertaffy', '', '')
+
+" }}}
 " ShowMarks {{{
 
 call s:HL('ShowMarksHLl', 'tardis', 'blackgravel')
@@ -399,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
@@ -508,6 +559,12 @@
 call s:HL('lessVariable', 'lime', '', 'none')
 
 " }}}
+" Lispyscript {{{
+
+call s:HL('lispyscriptDefMacro', 'lime', '', '')
+call s:HL('lispyscriptRepeat', 'dress', '', 'none')
+
+" }}}
 " Mail {{{
 
 call s:HL('mailSubject', 'orange', '', 'bold')