Add diff colors.

.hgignore

@@ -5,5 +5,6 @@ syntax: glob
 *.swp
 *.swo
 *.un~
+*~
 .ropeproject
 tags

.hgtags

@@ -0,0 +1,4 @@
+621c2b1cd1820ede93da83090ef4240ced361000 v1.0.0
+9c22ea4982a779254214a2fcb4ba62918afcae69 v1.1.0
+2804e4d33d917aa2251b6d33709d17223fd5e5d0 v1.1.1
+599ba7563aa4251e5f51c3e00ed8c993fe1426c5 v1.1.2

LICENSE.markdown

@@ -0,0 +1,18 @@
+Copyright (C) 2012 Steve Losh and Contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.**

README.markdown

@@ -6,6 +6,8 @@ A color scheme for Vim, pieced together by [Steve Losh](http://stevelosh.com/).
 There's still quite a lot of room for improvement (particularly in HTML) so feel
 free to send me ideas through the [issue tracker][] or pull requests.
 
+It's MIT/X11 licensed, so feel free to hack it apart if you like.
+
 **If you're going to send a pull request that you want me to merge, please post
 a comment in it with before/after screenshots!**
 
@@ -33,6 +35,19 @@ what you're in for.
 
 ![Screenshot](http://i.imgur.com/J56VS.png)
 
+Configuration
+-------------
+
+There are a few settings you can use to tweak how Bad Wolf looks.
+
+### g:badwolf\_html\_link\_underline
+
+Determines whether text inside `a` tags in HTML files will be underlined.
+
+    " Turn off HTML link underlining
+    let g:badwolf_html_link_underline = 0
+
+Default: `1` (on)
 
 Contributing
 ------------

colors/badwolf.vim

@@ -31,6 +31,10 @@
 " Supporting code -------------------------------------------------------------
 " Preamble {{{
 
+if !has("gui_running") && &t_Co != 88 && &t_Co != 256
+    finish
+endif
+
 set background=dark
 
 if exists("syntax_on")
@@ -39,6 +43,10 @@ endif
 
 let colors_name = "badwolf"
 
+if !exists("g:badwolf_html_link_underline") " {{{
+    let g:badwolf_html_link_underline = 1
+endif " }}}
+
 " }}}
 " Palette {{{
 
@@ -50,7 +58,7 @@ let s:bwc.plain = ['f8f6f2', 15]
 
 " Pure and simple.
 let s:bwc.snow = ['ffffff', 15]
-let s:bwc.coal = ['000000', 0]
+let s:bwc.coal = ['000000', 16]
 
 " All of the Gravel colors are based on a brown from Clouds Midnight.
 let s:bwc.brightgravel   = ['d9cec3', 252]
@@ -71,7 +79,10 @@ let s:bwc.dalespale = ['fade3e', 221]
 let s:bwc.dirtyblonde = ['f4cf86', 222]
 
 " Delicious, chewy red from Made of Code for the poppiest highlights.
-let s:bwc.taffy = ['ff2c4b', 197]
+let s:bwc.taffy = ['ff2c4b', 196]
+
+" Another chewy accent, but use sparingly!
+let s:bwc.saltwatertaffy = ['8cffba', 121]
 
 " The star of the show comes straight from Made of Code.
 let s:bwc.tardis = ['0a9dff', 39]
@@ -80,7 +91,7 @@ let s:bwc.tardis = ['0a9dff', 39]
 let s:bwc.orange = ['ffa724', 214]
 
 " A limier green from Getafe.
-let s:bwc.lime = ['aeee00', 148]
+let s:bwc.lime = ['aeee00', 154]
 
 " Rose's dress in The Idiot's Lantern.
 let s:bwc.dress = ['ff9eb8', 211]
@@ -94,7 +105,7 @@ let s:bwc.darkroast = ['88633f', 95]
 
 " }}}
 " Highlighting Function {{{
-function! HL(group, fg, ...)
+function! s:HL(group, fg, ...)
     " Arguments: group, guifg, guibg, gui, guisp
 
     let histring = 'hi ' . a:group . ' '
@@ -146,44 +157,44 @@ endif
 
 " General/UI {{{
 
-call HL('Normal', 'plain', 'blackgravel')
+call s:HL('Normal', 'plain', 'blackgravel')
 
-call HL('Folded', 'mediumgravel', 'bg', 'none')
+call s:HL('Folded', 'mediumgravel', 'bg', 'none')
 
-call HL('VertSplit', 'lightgravel', 'bg', 'none')
+call s:HL('VertSplit', 'lightgravel', 'bg', 'none')
 
-call HL('CursorLine',   '', 'darkgravel', 'none')
-call HL('CursorColumn', '', 'darkgravel')
-call HL('ColorColumn',  '', 'darkgravel')
+call s:HL('CursorLine',   '', 'darkgravel', 'none')
+call s:HL('CursorColumn', '', 'darkgravel')
+call s:HL('ColorColumn',  '', 'darkgravel')
 
-call HL('MatchParen', 'dalespale', 'darkgravel', 'bold')
+call s:HL('MatchParen', 'dalespale', 'darkgravel', 'bold')
 
-call HL('NonText',    'deepgravel', 'bg')
-call HL('SpecialKey', 'deepgravel', 'bg')
+call s:HL('NonText',    'deepgravel', 'bg')
+call s:HL('SpecialKey', 'deepgravel', 'bg')
 
-call HL('Visual',    '',  'deepgravel')
-call HL('VisualNOS', '',  'deepgravel')
+call s:HL('Visual',    '',  'deepgravel')
+call s:HL('VisualNOS', '',  'deepgravel')
 
-call HL('Search',    'coal', 'dalespale', 'bold')
-call HL('IncSearch', 'coal', 'tardis',    'bold')
+call s:HL('Search',    'coal', 'dalespale', 'bold')
+call s:HL('IncSearch', 'coal', 'tardis',    'bold')
 
-call HL('Underlined', 'fg', '', 'underline')
+call s:HL('Underlined', 'fg', '', 'underline')
 
-call HL('StatusLine',   'coal', 'tardis',     'bold')
-call HL('StatusLineNC', 'snow', 'deepgravel', 'bold')
+call s:HL('StatusLine',   'coal', 'tardis',     'bold')
+call s:HL('StatusLineNC', 'snow', 'deepgravel', 'bold')
 
-call HL('Directory', 'dirtyblonde', '', 'bold')
+call s:HL('Directory', 'dirtyblonde', '', 'bold')
 
-call HL('Title', 'lime')
+call s:HL('Title', 'lime')
 
-call HL('ErrorMsg',   'taffy',       'bg', 'bold')
-call HL('MoreMsg',    'dalespale',   '',   'bold')
-call HL('ModeMsg',    'dirtyblonde', '',   'bold')
-call HL('Question',   'dirtyblonde', '',   'bold')
-call HL('WarningMsg', 'dress',       '',   'bold')
+call s:HL('ErrorMsg',   'taffy',       'bg', 'bold')
+call s:HL('MoreMsg',    'dalespale',   '',   'bold')
+call s:HL('ModeMsg',    'dirtyblonde', '',   'bold')
+call s:HL('Question',   'dirtyblonde', '',   'bold')
+call s:HL('WarningMsg', 'dress',       '',   'bold')
 
 " This is a ctags tag, not an HTML one.  'Something you can use c-] on'.
-call HL('Tag', '', '', 'bold')
+call s:HL('Tag', '', '', 'bold')
 
 " hi IndentGuides                  guibg=#373737
 " hi WildMenu        guifg=#66D9EF guibg=#000000
@@ -191,42 +202,42 @@ call HL('Tag', '', '', 'bold')
 " }}}
 " Gutter {{{
 
-call HL('LineNr',     'mediumgravel', s:gutter)
-call HL('SignColumn', '',             s:gutter)
-call HL('FoldColumn', 'mediumgravel', s:gutter)
+call s:HL('LineNr',     'mediumgravel', s:gutter)
+call s:HL('SignColumn', '',             s:gutter)
+call s:HL('FoldColumn', 'mediumgravel', s:gutter)
 
 " }}}
 " Cursor {{{
 
-call HL('Cursor',  'coal', 'tardis', 'bold')
-call HL('vCursor', 'coal', 'tardis', 'bold')
-call HL('iCursor', 'coal', 'tardis', 'none')
+call s:HL('Cursor',  'coal', 'tardis', 'bold')
+call s:HL('vCursor', 'coal', 'tardis', 'bold')
+call s:HL('iCursor', 'coal', 'tardis', 'none')
 
 " }}}
 " Syntax highlighting {{{
 
 " Start with a simple base.
-call HL('Special', 'plain')
+call s:HL('Special', 'plain')
 
 " Comments are slightly brighter than folds, to make 'headers' easier to see.
-call HL('Comment',        'gravel')
-call HL('Todo',           'snow', 'bg', 'bold')
-call HL('SpecialComment', 'snow', 'bg', 'bold')
+call s:HL('Comment',        'gravel')
+call s:HL('Todo',           'snow', 'bg', 'bold')
+call s:HL('SpecialComment', 'snow', 'bg', 'bold')
 
 " Strings are a nice, pale straw color.  Nothing too fancy.
-call HL('String', 'dirtyblonde')
+call s:HL('String', 'dirtyblonde')
 
 " Control flow stuff is taffy.
-call HL('Statement',   'taffy', '', 'bold')
-call HL('Keyword',     'taffy', '', 'bold')
-call HL('Conditional', 'taffy', '', 'bold')
-call HL('Operator',    'taffy', '', 'none')
-call HL('Label',       'taffy', '', 'none')
-call HL('Repeat',      'taffy', '', 'none')
+call s:HL('Statement',   'taffy', '', 'bold')
+call s:HL('Keyword',     'taffy', '', 'bold')
+call s:HL('Conditional', 'taffy', '', 'bold')
+call s:HL('Operator',    'taffy', '', 'none')
+call s:HL('Label',       'taffy', '', 'none')
+call s:HL('Repeat',      'taffy', '', 'none')
 
 " Functions and variable declarations are orange, because plain looks weird.
-call HL('Identifier', 'orange', '', 'none')
-call HL('Function',   'orange', '', 'none')
+call s:HL('Identifier', 'orange', '', 'none')
+call s:HL('Function',   'orange', '', 'none')
 
 " Preprocessor stuff is lime, to make it pop.
 "
@@ -234,60 +245,60 @@ call HL('Function',   'orange', '', 'none')
 " grouped together at the beginning of a file.  If they're in the middle of some
 " other code they should stand out, because something tricky is
 " probably going on.
-call HL('PreProc',   'lime', '', 'none')
-call HL('Macro',     'lime', '', 'none')
-call HL('Define',    'lime', '', 'none')
-call HL('PreCondit', 'lime', '', 'bold')
+call s:HL('PreProc',   'lime', '', 'none')
+call s:HL('Macro',     'lime', '', 'none')
+call s:HL('Define',    'lime', '', 'none')
+call s:HL('PreCondit', 'lime', '', 'bold')
 
 " Constants of all kinds are colored together.
 " I'm not really happy with the color yet...
-call HL('Constant',  'toffee', '', 'bold')
-call HL('Character', 'toffee', '', 'bold')
-call HL('Boolean',   'toffee', '', 'bold')
+call s:HL('Constant',  'toffee', '', 'bold')
+call s:HL('Character', 'toffee', '', 'bold')
+call s:HL('Boolean',   'toffee', '', 'bold')
 
-call HL('Number', 'toffee', '', 'bold')
-call HL('Float',  'toffee', '', 'bold')
+call s:HL('Number', 'toffee', '', 'bold')
+call s:HL('Float',  'toffee', '', 'bold')
 
 " Not sure what 'special character in a constant' means, but let's make it pop.
-call HL('SpecialChar', 'dress', '', 'bold')
+call s:HL('SpecialChar', 'dress', '', 'bold')
 
-call HL('Type', 'dress', '', 'none')
-call HL('StorageClass', 'taffy', '', 'none')
-call HL('Structure', 'taffy', '', 'none')
-call HL('Typedef', 'taffy', '', 'bold')
+call s:HL('Type', 'dress', '', 'none')
+call s:HL('StorageClass', 'taffy', '', 'none')
+call s:HL('Structure', 'taffy', '', 'none')
+call s:HL('Typedef', 'taffy', '', 'bold')
 
 " Make try/catch blocks stand out.
-call HL('Exception', 'lime', '', 'bold')
+call s:HL('Exception', 'lime', '', 'bold')
 
 " Misc
-call HL('Error',  'snow',   'taffy', 'bold')
-call HL('Debug',  'snow',   '',      'bold')
-call HL('Ignore', 'gravel', '',      '')
+call s:HL('Error',  'snow',   'taffy', 'bold')
+call s:HL('Debug',  'snow',   '',      'bold')
+call s:HL('Ignore', 'gravel', '',      '')
 
 " }}}
 " Completion Menu {{{
 
-call HL('Pmenu', 'plain', 'deepergravel')
-call HL('PmenuSel', 'coal', 'tardis', 'bold')
-call HL('PmenuSbar', '', 'deepergravel')
-call HL('PmenuThumb', 'brightgravel')
+call s:HL('Pmenu', 'plain', 'deepergravel')
+call s:HL('PmenuSel', 'coal', 'tardis', 'bold')
+call s:HL('PmenuSbar', '', 'deepergravel')
+call s:HL('PmenuThumb', 'brightgravel')
 
 " }}}
 " Diffs {{{
 
-call HL('DiffDelete', 'coal', 'coal')
-call HL('DiffAdd',    '',     'deepergravel')
-call HL('DiffChange', '',     'darkgravel')
-call HL('DiffText',   'snow', 'deepergravel', 'bold')
+call s:HL('DiffDelete', 'coal', 'coal')
+call s:HL('DiffAdd',    '',     'deepergravel')
+call s:HL('DiffChange', '',     'darkgravel')
+call s:HL('DiffText',   'snow', 'deepergravel', 'bold')
 
 " }}}
 " Spelling {{{
 
 if has("spell")
-    call HL('SpellCap', 'dalespale', '', 'undercurl,bold', 'dalespale')
-    call HL('SpellBad', '', '', 'undercurl', 'dalespale')
-    call HL('SpellLocal', '', '', 'undercurl', 'dalespale')
-    call HL('SpellRare', '', '', 'undercurl', 'dalespale')
+    call s:HL('SpellCap', 'dalespale', 'bg', 'undercurl,bold', 'dalespale')
+    call s:HL('SpellBad', '', '', 'undercurl', 'dalespale')
+    call s:HL('SpellLocal', '', '', 'undercurl', 'dalespale')
+    call s:HL('SpellRare', '', '', 'undercurl', 'dalespale')
 endif
 
 " }}}
@@ -295,19 +306,56 @@ endif
 " }}}
 " Plugins {{{
 
+" CtrlP {{{
+
+    " the message when no match is found
+    call s:HL('CtrlPNoEntries', 'snow', 'taffy', 'bold')
+
+    " the matched pattern
+    call s:HL('CtrlPMatch', 'orange', 'bg', 'none')
+
+    " the line prefix '>' in the match window
+    call s:HL('CtrlPLinePre', 'deepgravel', 'bg', 'none')
+
+    " the prompt’s base
+    call s:HL('CtrlPPrtBase', 'deepgravel', 'bg', 'none')
+
+    " the prompt’s text
+    call s:HL('CtrlPPrtText', 'plain', 'bg', 'none')
+
+    " the prompt’s cursor when moving over the text
+    call s:HL('CtrlPPrtCursor', 'coal', 'tardis', 'bold')
+
+    " 'prt' or 'win', also for 'regex'
+    call s:HL('CtrlPMode1', 'coal', 'tardis', 'bold')
+
+    " 'file' or 'path', also for the local working dir
+    call s:HL('CtrlPMode2', 'coal', 'tardis', 'bold')
+
+    " the scanning status
+    call s:HL('CtrlPStats', 'coal', 'tardis', 'bold')
+
+    " TODO: CtrlP extensions.
+    " CtrlPTabExtra  : the part of each line that’s not matched against (Comment)
+    " CtrlPqfLineCol : the line and column numbers in quickfix mode (|s:HL-Search|)
+    " CtrlPUndoT     : the elapsed time in undo mode (|s:HL-Directory|)
+    " CtrlPUndoBr    : the square brackets [] in undo mode (Comment)
+    " CtrlPUndoNr    : the undo number inside [] in undo mode (String)
+
+" }}}
 " EasyMotion {{{
 
-call HL('EasyMotionTarget', 'tardis',     'bg', 'bold')
-call HL('EasyMotionShade',  'deepgravel', 'bg')
+call s:HL('EasyMotionTarget', 'tardis',     'bg', 'bold')
+call s:HL('EasyMotionShade',  'deepgravel', 'bg')
 
 " }}}
 " Interesting Words {{{
 
 " These are only used if you're me or have copied the <leader>hNUM mappings
 " from my Vimrc.
-call HL('InterestingWord1', 'coal', 'orange')
-call HL('InterestingWord2', 'coal', 'lime')
-call HL('InterestingWord3', 'coal', 'taffy')
+call s:HL('InterestingWord1', 'coal', 'orange')
+call s:HL('InterestingWord2', 'coal', 'lime')
+call s:HL('InterestingWord3', 'coal', 'taffy')
 
 " }}}
 " Makegreen {{{
@@ -318,10 +366,10 @@ call HL('InterestingWord3', 'coal', 'taffy')
 " }}}
 " ShowMarks {{{
 
-call HL('ShowMarksHLl', 'tardis', 'blackgravel')
-call HL('ShowMarksHLu', 'tardis', 'blackgravel')
-call HL('ShowMarksHLo', 'tardis', 'blackgravel')
-call HL('ShowMarksHLm', 'tardis', 'blackgravel')
+call s:HL('ShowMarksHLl', 'tardis', 'blackgravel')
+call s:HL('ShowMarksHLu', 'tardis', 'blackgravel')
+call s:HL('ShowMarksHLo', 'tardis', 'blackgravel')
+call s:HL('ShowMarksHLm', 'tardis', 'blackgravel')
 
 " }}}
 
@@ -330,43 +378,56 @@ call HL('ShowMarksHLm', 'tardis', 'blackgravel')
 
 " Clojure {{{
 
-call HL('clojureSpecial',  'taffy', '', '')
-call HL('clojureDefn',     'taffy', '', '')
-call HL('clojureDefMacro', 'taffy', '', '')
-call HL('clojureDefine',   'taffy', '', '')
-call HL('clojureMacro',    'taffy', '', '')
-call HL('clojureCond',     'taffy', '', '')
+call s:HL('clojureSpecial',  'taffy', '', '')
+call s:HL('clojureDefn',     'taffy', '', '')
+call s:HL('clojureDefMacro', 'taffy', '', '')
+call s:HL('clojureDefine',   'taffy', '', '')
+call s:HL('clojureMacro',    'taffy', '', '')
+call s:HL('clojureCond',     'taffy', '', '')
 
-call HL('clojureKeyword', 'orange', '', 'none')
+call s:HL('clojureKeyword', 'orange', '', 'none')
 
-call HL('clojureFunc',   'dress', '', 'none')
-call HL('clojureRepeat', 'dress', '', 'none')
+call s:HL('clojureFunc',   'dress', '', 'none')
+call s:HL('clojureRepeat', 'dress', '', 'none')
 
-call HL('clojureParen0', 'lightgravel', '', 'none')
+call s:HL('clojureParen0', 'lightgravel', '', 'none')
 
-call HL('clojureAnonArg', 'snow', '', 'bold')
+call s:HL('clojureAnonArg', 'snow', '', 'bold')
 
 " }}}
 " CSS {{{
 
-call HL('cssColorProp', 'fg', '', 'none')
-call HL('cssBoxProp', 'fg', '', 'none')
-call HL('cssTextProp', 'fg', '', 'none')
-call HL('cssRenderProp', 'fg', '', 'none')
-call HL('cssGeneratedContentProp', 'fg', '', 'none')
+call s:HL('cssColorProp', 'fg', '', 'none')
+call s:HL('cssBoxProp', 'fg', '', 'none')
+call s:HL('cssTextProp', 'fg', '', 'none')
+call s:HL('cssRenderProp', 'fg', '', 'none')
+call s:HL('cssGeneratedContentProp', 'fg', '', 'none')
 
-call HL('cssValueLength', 'toffee', '', 'bold')
-call HL('cssColor', 'toffee', '', 'bold')
-call HL('cssBraces', 'lightgravel', '', 'none')
-call HL('cssIdentifier', 'orange', '', 'bold')
-call HL('cssClassName', 'orange', '', 'none')
+call s:HL('cssValueLength', 'toffee', '', 'bold')
+call s:HL('cssColor', 'toffee', '', 'bold')
+call s:HL('cssBraces', 'lightgravel', '', 'none')
+call s:HL('cssIdentifier', 'orange', '', 'bold')
+call s:HL('cssClassName', 'orange', '', 'none')
+
+" }}}
+" Diff {{{
+
+call s:HL('gitDiff', 'lightgravel', '',)
+
+call s:HL('diffRemoved', 'dress', '',)
+call s:HL('diffAdded', 'lime', '',)
+call s:HL('diffFile', 'coal', 'taffy', 'bold')
+call s:HL('diffNewFile', 'coal', 'taffy', 'bold')
+
+call s:HL('diffLine', 'coal', 'orange', 'bold')
+call s:HL('diffSubname', 'orange', '', 'none')
 
 " }}}
 " Django Templates {{{
 
-call HL('djangoArgument', 'dirtyblonde', '',)
-call HL('djangoTagBlock', 'orange', '')
-call HL('djangoVarBlock', 'orange', '')
+call s:HL('djangoArgument', 'dirtyblonde', '',)
+call s:HL('djangoTagBlock', 'orange', '')
+call s:HL('djangoVarBlock', 'orange', '')
 " hi djangoStatement guifg=#ff3853 gui=bold
 " hi djangoVarBlock guifg=#f4cf86
 
@@ -374,92 +435,117 @@ call HL('djangoVarBlock', 'orange', '')
 " HTML {{{
 
 " Punctuation
-call HL('htmlTag',    'darkroast', 'bg', 'none')
-call HL('htmlEndTag', 'darkroast', 'bg', 'none')
+call s:HL('htmlTag',    'darkroast', 'bg', 'none')
+call s:HL('htmlEndTag', 'darkroast', 'bg', 'none')
 
 " Tag names
-call HL('htmlTagName',        'coffee', '', 'bold')
-call HL('htmlSpecialTagName', 'coffee', '', 'bold')
+call s:HL('htmlTagName',        'coffee', '', 'bold')
+call s:HL('htmlSpecialTagName', 'coffee', '', 'bold')
 
 " Attributes
-call HL('htmlArg', 'coffee', '', 'none')
+call s:HL('htmlArg', 'coffee', '', 'none')
 
 " Stuff inside an <a> tag
-call HL('htmlLink', 'lightgravel', '', 'underline')
+
+if g:badwolf_html_link_underline
+    call s:HL('htmlLink', 'lightgravel', '', 'underline')
+else
+    call s:HL('htmlLink', 'lightgravel', '', 'none')
+endif
 
 " }}}
 " Java {{{
 
-call HL('javaClassDecl', 'taffy', '', 'bold')
-call HL('javaScopeDecl', 'taffy', '', 'bold')
-call HL('javaCommentTitle', 'gravel', '')
-call HL('javaDocTags', 'snow', '', 'none')
-call HL('javaDocParam', 'dalespale', '', '')
+call s:HL('javaClassDecl', 'taffy', '', 'bold')
+call s:HL('javaScopeDecl', 'taffy', '', 'bold')
+call s:HL('javaCommentTitle', 'gravel', '')
+call s:HL('javaDocTags', 'snow', '', 'none')
+call s:HL('javaDocParam', 'dalespale', '', '')
 
 " }}}
 " LessCSS {{{
 
-call HL('lessVariable', 'lime', '', 'none')
+call s:HL('lessVariable', 'lime', '', 'none')
 
 " }}}
 " Mail {{{
 
-call HL('mailSubject', 'orange', '', 'bold')
-call HL('mailHeader', 'lightgravel', '', '')
-call HL('mailHeaderKey', 'lightgravel', '', '')
-call HL('mailHeaderEmail', 'snow', '', '')
-call HL('mailURL', 'toffee', '', 'underline')
-call HL('mailSignature', 'gravel', '', 'none')
+call s:HL('mailSubject', 'orange', '', 'bold')
+call s:HL('mailHeader', 'lightgravel', '', '')
+call s:HL('mailHeaderKey', 'lightgravel', '', '')
+call s:HL('mailHeaderEmail', 'snow', '', '')
+call s:HL('mailURL', 'toffee', '', 'underline')
+call s:HL('mailSignature', 'gravel', '', 'none')
 
-call HL('mailQuoted1', 'gravel', '', 'none')
-call HL('mailQuoted2', 'dress', '', 'none')
-call HL('mailQuoted3', 'dirtyblonde', '', 'none')
-call HL('mailQuoted4', 'orange', '', 'none')
-call HL('mailQuoted5', 'lime', '', 'none')
+call s:HL('mailQuoted1', 'gravel', '', 'none')
+call s:HL('mailQuoted2', 'dress', '', 'none')
+call s:HL('mailQuoted3', 'dirtyblonde', '', 'none')
+call s:HL('mailQuoted4', 'orange', '', 'none')
+call s:HL('mailQuoted5', 'lime', '', 'none')
 
 " }}}
 " Markdown {{{
 
-call HL('markdownHeadingRule', 'lightgravel', '', 'bold')
-call HL('markdownHeadingDelimiter', 'lightgravel', '', 'bold')
-call HL('markdownOrderedListMarker', 'lightgravel', '', 'bold')
-call HL('markdownListMarker', 'lightgravel', '', 'bold')
-call HL('markdownH1', 'orange', '', 'bold')
-call HL('markdownH2', 'lime', '', 'bold')
-call HL('markdownH3', 'lime', '', 'none')
-call HL('markdownH4', 'lime', '', 'none')
-call HL('markdownH5', 'lime', '', 'none')
-call HL('markdownH6', 'lime', '', 'none')
-call HL('markdownLinkText', 'toffee', '', 'underline')
-call HL('markdownIdDeclaration', 'toffee')
-call HL('markdownAutomaticLink', 'toffee', '', 'bold')
-call HL('markdownUrl', 'toffee', '', 'bold')
-call HL('markdownUrldelimiter', 'lightgravel', '', 'bold')
-call HL('markdownLinkDelimiter', 'lightgravel', '', 'bold')
-call HL('markdownLinkTextDelimiter', 'lightgravel', '', 'bold')
-call HL('markdownCodeDelimiter', 'dirtyblonde', '', 'bold')
-call HL('markdownCode', 'dirtyblonde', '', 'none')
-call HL('markdownCodeBlock', 'dirtyblonde', '', 'none')
+call s:HL('markdownHeadingRule', 'lightgravel', '', 'bold')
+call s:HL('markdownHeadingDelimiter', 'lightgravel', '', 'bold')
+call s:HL('markdownOrderedListMarker', 'lightgravel', '', 'bold')
+call s:HL('markdownListMarker', 'lightgravel', '', 'bold')
+call s:HL('markdownItalic', 'snow', '', 'bold')
+call s:HL('markdownBold', 'snow', '', 'bold')
+call s:HL('markdownH1', 'orange', '', 'bold')
+call s:HL('markdownH2', 'lime', '', 'bold')
+call s:HL('markdownH3', 'lime', '', 'none')
+call s:HL('markdownH4', 'lime', '', 'none')
+call s:HL('markdownH5', 'lime', '', 'none')
+call s:HL('markdownH6', 'lime', '', 'none')
+call s:HL('markdownLinkText', 'toffee', '', 'underline')
+call s:HL('markdownIdDeclaration', 'toffee')
+call s:HL('markdownAutomaticLink', 'toffee', '', 'bold')
+call s:HL('markdownUrl', 'toffee', '', 'bold')
+call s:HL('markdownUrldelimiter', 'lightgravel', '', 'bold')
+call s:HL('markdownLinkDelimiter', 'lightgravel', '', 'bold')
+call s:HL('markdownLinkTextDelimiter', 'lightgravel', '', 'bold')
+call s:HL('markdownCodeDelimiter', 'dirtyblonde', '', 'bold')
+call s:HL('markdownCode', 'dirtyblonde', '', 'none')
+call s:HL('markdownCodeBlock', 'dirtyblonde', '', 'none')
 
 " }}}
 " Python {{{
 
 hi def link pythonOperator Operator
-call HL('pythonBuiltin',    'dress')
-call HL('pythonEscape',     'dress')
-call HL('pythonException',  'lime', '', 'bold')
-call HL('pythonExceptions', 'lime', '', 'none')
-call HL('pythonDecorator',  'taffy', '', 'none')
+call s:HL('pythonBuiltin',    'dress')
+call s:HL('pythonBuiltinObj', 'dress')
+call s:HL('pythonBuiltinFunc', 'dress')
+call s:HL('pythonEscape',     'dress')
+call s:HL('pythonException',  'lime', '', 'bold')
+call s:HL('pythonExceptions', 'lime', '', 'none')
+call s:HL('pythonPrecondit', 'lime', '', 'none')
+call s:HL('pythonDecorator',  'taffy', '', 'none')
+
+" }}}
+" SLIMV {{{
+
+" Rainbow parentheses
+call s:HL('hlLevel0', 'gravel')
+call s:HL('hlLevel1', 'orange')
+call s:HL('hlLevel2', 'saltwatertaffy')
+call s:HL('hlLevel3', 'dress')
+call s:HL('hlLevel4', 'coffee')
+call s:HL('hlLevel5', 'dirtyblonde')
+call s:HL('hlLevel6', 'orange')
+call s:HL('hlLevel7', 'saltwatertaffy')
+call s:HL('hlLevel8', 'dress')
+call s:HL('hlLevel9', 'coffee')
 
 " }}}
 " Vim {{{
 
-call HL('VimCommentTitle', 'lightgravel', '', 'bold')
+call s:HL('VimCommentTitle', 'lightgravel', '', 'bold')
 
-call HL('VimMapMod',    'dress', '', 'none')
-call HL('VimMapModKey', 'dress', '', 'none')
-call HL('VimNotation', 'dress', '', 'none')
-call HL('VimBracket', 'dress', '', 'none')
+call s:HL('VimMapMod',    'dress', '', 'none')
+call s:HL('VimMapModKey', 'dress', '', 'none')
+call s:HL('VimNotation', 'dress', '', 'none')
+call s:HL('VimBracket', 'dress', '', 'none')
 
 " }}}
 

package.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+hg archive ~/Desktop/badwolf.zip -I 'colors' -I README.markdown