Merge e6921fae32 into 15b37caad7

colors/badwolf.vim

@@ -35,7 +35,6 @@ if !has("gui_running") && &t_Co != 88 && &t_Co != 256
     finish
 endif
 
-highlight clear
 set background=dark
 
 if exists("syntax_on")
@@ -640,6 +639,9 @@ call s:HL('pythonDecorator',   'taffy', '', 'none')
 call s:HL('pythonRun',         'gravel', '', 'bold')
 call s:HL('pythonCoding',      'gravel', '', 'bold')
 
+" }}}
+" GO {{{
+call s:HL('goDirective', 'lime', '', 'none')
 " }}}
 " SLIMV {{{
 

colors/goodwolf.vim

@@ -19,7 +19,6 @@ if !has("gui_running") && &t_Co != 88 && &t_Co != 256
     finish
 endif
 
-highlight clear
 set background=dark
 
 if exists("syntax_on")
@@ -438,21 +437,6 @@ else
     call GoodWolfHL('htmlLink', 'lightgravel', '', 'none')
 endif
 
-" }}}
-" HTML/Django {{{
-
-call GoodWolfHL('djangoTagBlock',  'coffee', 'bg', 'bold')
-call GoodWolfHL('djangoStatement', 'orange', 'bg', 'none')
-call GoodWolfHL('djangoArgument',  'dress', 'bg', 'none')
-call GoodWolfHL('djangoVarBlock',  'lime', 'bg', 'none')
-
-" }}}
-" HTML/TEN {{{
-
-call GoodWolfHL('tenTagBlock',  'orange', 'bg', 'bold')
-call GoodWolfHL('tenArgument',  'lime', 'bg', 'none')
-call GoodWolfHL('tenVarBlock',  'dress', 'bg', 'none')
-
 " }}}
 " Java {{{
 
@@ -579,13 +563,6 @@ call GoodWolfHL('scalaParamAnnotationValue', 'gravel', '', 'bold')
 call GoodWolfHL('scalaCommentAnnotation', 'gravel', '', 'bold')
 call GoodWolfHL('scalaDocLinks', 'gravel', '', 'bold')
 
-" }}}
-" Singularity {{{
-
-call GoodWolfHL('singularitySectionLine', 'taffy', '', 'bold')
-call GoodWolfHL('singularitySection', 'taffy', '', 'bold')
-call GoodWolfHL('singularityKeyword', 'dress', '', '')
-
 " }}}
 " Vim {{{