From 655fe358fa659f13dd60a3d9d594fdd99f0d8d9e Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Sun, 7 Dec 2014 18:55:42 +0000
Subject: [PATCH] Clear vim highlight groups before setting, don't use black
 backgrounds

---
 colors/twilight.vim | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/colors/twilight.vim b/colors/twilight.vim
index ba8cfed..5cb8bef 100644
--- a/colors/twilight.vim
+++ b/colors/twilight.vim
@@ -41,6 +41,7 @@ if has("gui_running") || &t_Co == 256
 
   "" functions "{{{
   function <SID>HiGroup(group, fg, bg, attr)
+    exec "hi clear ".a:group
     if 1 < len(a:fg)
       exec "hi ".a:group." ctermfg=".get(a:fg, 0)
       if 2 == len(a:fg)
@@ -82,19 +83,19 @@ if has("gui_running") || &t_Co == 256
   call <SID>HiGroup("MatchParen", s:none, s:dark_green_blue, "none")
   "call <SID>HiGroup("ModeMsg", s:empty, s:empty, "none")
   "call <SID>HiGroup("MoreMsg", s:empty, s:empty, "none")
-  call <SID>HiGroup("NonText", s:blue, s:black, "none")
-  call <SID>HiGroup("Normal", s:white, s:black, "none")
+  call <SID>HiGroup("NonText", s:blue, s:empty, "none")
+  call <SID>HiGroup("Normal", s:white, s:empty, "none")
   call <SID>HiGroup("Pmenu", s:light_grey, s:grey, "none")
   call <SID>HiGroup("PmenuSel", s:black, s:light_orange, "bold")
   "call <SID>HiGroup("PmenuSbar", s:empty, s:empty, "none")
   "call <SID>HiGroup("PmenuThumb", s:empty, s:empty, "none")
   "call <SID>HiGroup("Question", s:empty, s:empty, "none")
-  call <SID>HiGroup("Search", s:none, s:light_grey, "reverse")
+  call <SID>HiGroup("Search", s:none, s:dark_grey, "none")
   "call <SID>HiGroup("SpecialKey", s:emptnoney, s:empty, "none")
-  call <SID>HiGroup("SpellBad", s:bright_red, s:black, "bold")
-  call <SID>HiGroup("SpellCap", s:blue, s:black, "bold")
-  call <SID>HiGroup("SpellLocal", s:light_orange, s:black, "bold")
-  call <SID>HiGroup("SpellRare", s:beige, s:black, "bold")
+  call <SID>HiGroup("SpellBad", s:bright_red, s:empty, "bold")
+  call <SID>HiGroup("SpellCap", s:blue, s:empty, "bold")
+  call <SID>HiGroup("SpellLocal", s:light_orange, s:empty, "bold")
+  call <SID>HiGroup("SpellRare", s:beige, s:empty, "bold")
   "call <SID>HiGroup("StatusLine", s:empty, s:empty, "none")
   "call <SID>HiGroup("StatusLineNC", s:empty, s:empty, "none")
   call <SID>HiGroup("TabLine", s:light_grey, s:mid_grey, "bold")
@@ -149,17 +150,17 @@ if has("gui_running") || &t_Co == 256
   "call <SID>HiGroup("SpecialComment", s:empty, s:empty, "none")
   "call <SID>HiGroup("Debug", s:empty, s:empty, "none")
 
-  call <SID>HiGroup("Underlined", s:blue, s:none, "underline")
+  call <SID>HiGroup("Underlined", s:blue, s:empty, "underline")
 
   "call <SID>HiGroup("Ignore", s:empty, s:empty, "none")
 
   call <SID>HiGroup("Error", s:white, s:red, "bold")
 
-  call <SID>HiGroup("Todo", s:orange, s:dark_grey, "bold")
+  call <SID>HiGroup("Todo", s:orange, s:empty, "bold")
   " }}}
 
   "" custom syntax groups {{{
-  call <SID>HiGroup("Note", s:dark_green, s:none, "bold")
+  call <SID>HiGroup("Note", s:dark_green, s:empty, "bold")
   call <SID>HiGroup("Important", s:bright_yellow, s:empty, "bold")
   call <SID>HiGroup("Research", s:orange, s:empty, "bold")