Permalink
Browse files

Added missing "Folded" and "FoldColumn" as well as briging other colo…

…r variations uptodate with Tomorrow Night
  • Loading branch information...
1 parent 6fbdcc0 commit 0893eef19d1350b8b25922ad4e01d4aac64e9dc9 Chris Kempson committed Nov 22, 2011
Showing with 100 additions and 54 deletions.
  1. +23 −12 colors/Tomorrow-Night-Blue.vim
  2. +23 −12 colors/Tomorrow-Night-Bright.vim
  3. +23 −12 colors/Tomorrow-Night-Eighties.vim
  4. +3 −1 colors/Tomorrow-Night.vim
  5. +28 −17 colors/Tomorrow.vim
@@ -233,20 +233,23 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
" Vim Highlighting
call <SID>X("Normal", s:foreground, s:background, "")
- call <SID>X("LineNr", s:foreground, s:line, "")
+ call <SID>X("LineNr", s:selection, "", "")
call <SID>X("NonText", s:selection, "", "")
call <SID>X("SpecialKey", s:selection, "", "")
call <SID>X("Search", s:background, s:yellow, "")
call <SID>X("TabLine", s:foreground, s:background, "reverse")
- call <SID>X("StatusLine", s:foreground, s:background, "reverse")
- call <SID>X("StatusLineNC", s:foreground, s:background, "reverse")
- call <SID>X("VertSplit", s:foreground, s:foreground, "")
+ call <SID>X("StatusLine", s:window, s:yellow, "reverse")
+ call <SID>X("StatusLineNC", s:window, s:foreground, "reverse")
+ call <SID>X("VertSplit", s:window, s:window, "none")
call <SID>X("Visual", "", s:selection, "")
call <SID>X("Directory", s:blue, "", "")
call <SID>X("ModeMsg", s:green, "", "")
call <SID>X("MoreMsg", s:green, "", "")
call <SID>X("Question", s:green, "", "")
call <SID>X("WarningMsg", s:red, "", "")
+ call <SID>X("MatchParen", "", s:selection, "")
+ call <SID>X("Folded", s:comment, s:background, "")
+ call <SID>X("FoldColumn", "", s:background, "")
if version >= 700
call <SID>X("CursorLine", "", s:line, "none")
call <SID>X("CursorColumn", "", s:line, "none")
@@ -259,7 +262,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
" Standard Highlighting
call <SID>X("Comment", s:comment, "", "")
- call <SID>X("Todo", s:comment, "", "")
+ call <SID>X("Todo", s:comment, s:background, "")
call <SID>X("Title", s:comment, "", "")
call <SID>X("Identifier", s:red, "", "none")
call <SID>X("Statement", s:foreground, "", "")
@@ -274,9 +277,9 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("Operator", s:aqua, "", "none")
call <SID>X("Type", s:blue, "", "none")
call <SID>X("Define", s:purple, "", "none")
- call <SID>X("Include", s:blue, "", "")
+ call <SID>X("Include", s:blue, "", "")
"call <SID>X("Ignore", "666666", "", "")
-
+
" Vim Highlighting
call <SID>X("vimCommand", s:red, "", "none")
@@ -291,28 +294,36 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("phpConditional", s:purple, "", "")
call <SID>X("phpStatement", s:purple, "", "")
call <SID>X("phpMemberSelector", s:foreground, "", "")
-
+
" Ruby Highlighting
call <SID>X("rubySymbol", s:green, "", "")
call <SID>X("rubyConstant", s:yellow, "", "")
call <SID>X("rubyAttribute", s:blue, "", "")
call <SID>X("rubyInclude", s:blue, "", "")
call <SID>X("rubyLocalVariableOrMethod", s:orange, "", "")
call <SID>X("rubyCurlyBlock", s:orange, "", "")
-
+ call <SID>X("rubyStringDelimiter", s:green, "", "")
+ call <SID>X("rubyInterpolationDelimiter", s:orange, "", "")
+ call <SID>X("rubyConditional", s:purple, "", "")
+ call <SID>X("rubyRepeat", s:purple, "", "")
+
" Python Highlighting
call <SID>X("pythonInclude", s:purple, "", "")
call <SID>X("pythonStatement", s:purple, "", "")
call <SID>X("pythonConditional", s:purple, "", "")
call <SID>X("pythonFunction", s:blue, "", "")
-
+
" JavaScript Highlighting
call <SID>X("javaScriptBraces", s:foreground, "", "")
call <SID>X("javaScriptFunction", s:purple, "", "")
call <SID>X("javaScriptConditional", s:purple, "", "")
call <SID>X("javaScriptRepeat", s:purple, "", "")
call <SID>X("javaScriptNumber", s:orange, "", "")
- call <SID>X("javaScriptMember", s:orange, "", "")
+ call <SID>X("javaScriptMember", s:orange, "", "")
+
+ " Diff Highlighting
+ call <SID>X("diffAdded", s:green, "", "")
+ call <SID>X("diffRemoved", s:red, "", "")
" Delete Functions
delf <SID>X
@@ -324,4 +335,4 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
delf <SID>grey_colour
delf <SID>grey_level
delf <SID>grey_number
-endif
+endif
@@ -233,20 +233,23 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
" Vim Highlighting
call <SID>X("Normal", s:foreground, s:background, "")
- call <SID>X("LineNr", s:foreground, s:line, "")
+ call <SID>X("LineNr", s:selection, "", "")
call <SID>X("NonText", s:selection, "", "")
call <SID>X("SpecialKey", s:selection, "", "")
call <SID>X("Search", s:background, s:yellow, "")
call <SID>X("TabLine", s:foreground, s:background, "reverse")
- call <SID>X("StatusLine", s:foreground, s:background, "reverse")
- call <SID>X("StatusLineNC", s:foreground, s:background, "reverse")
- call <SID>X("VertSplit", s:foreground, s:foreground, "")
+ call <SID>X("StatusLine", s:window, s:yellow, "reverse")
+ call <SID>X("StatusLineNC", s:window, s:foreground, "reverse")
+ call <SID>X("VertSplit", s:window, s:window, "none")
call <SID>X("Visual", "", s:selection, "")
call <SID>X("Directory", s:blue, "", "")
call <SID>X("ModeMsg", s:green, "", "")
call <SID>X("MoreMsg", s:green, "", "")
call <SID>X("Question", s:green, "", "")
call <SID>X("WarningMsg", s:red, "", "")
+ call <SID>X("MatchParen", "", s:selection, "")
+ call <SID>X("Folded", s:comment, s:background, "")
+ call <SID>X("FoldColumn", "", s:background, "")
if version >= 700
call <SID>X("CursorLine", "", s:line, "none")
call <SID>X("CursorColumn", "", s:line, "none")
@@ -259,7 +262,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
" Standard Highlighting
call <SID>X("Comment", s:comment, "", "")
- call <SID>X("Todo", s:comment, "", "")
+ call <SID>X("Todo", s:comment, s:background, "")
call <SID>X("Title", s:comment, "", "")
call <SID>X("Identifier", s:red, "", "none")
call <SID>X("Statement", s:foreground, "", "")
@@ -274,9 +277,9 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("Operator", s:aqua, "", "none")
call <SID>X("Type", s:blue, "", "none")
call <SID>X("Define", s:purple, "", "none")
- call <SID>X("Include", s:blue, "", "")
+ call <SID>X("Include", s:blue, "", "")
"call <SID>X("Ignore", "666666", "", "")
-
+
" Vim Highlighting
call <SID>X("vimCommand", s:red, "", "none")
@@ -291,28 +294,36 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("phpConditional", s:purple, "", "")
call <SID>X("phpStatement", s:purple, "", "")
call <SID>X("phpMemberSelector", s:foreground, "", "")
-
+
" Ruby Highlighting
call <SID>X("rubySymbol", s:green, "", "")
call <SID>X("rubyConstant", s:yellow, "", "")
call <SID>X("rubyAttribute", s:blue, "", "")
call <SID>X("rubyInclude", s:blue, "", "")
call <SID>X("rubyLocalVariableOrMethod", s:orange, "", "")
call <SID>X("rubyCurlyBlock", s:orange, "", "")
-
+ call <SID>X("rubyStringDelimiter", s:green, "", "")
+ call <SID>X("rubyInterpolationDelimiter", s:orange, "", "")
+ call <SID>X("rubyConditional", s:purple, "", "")
+ call <SID>X("rubyRepeat", s:purple, "", "")
+
" Python Highlighting
call <SID>X("pythonInclude", s:purple, "", "")
call <SID>X("pythonStatement", s:purple, "", "")
call <SID>X("pythonConditional", s:purple, "", "")
call <SID>X("pythonFunction", s:blue, "", "")
-
+
" JavaScript Highlighting
call <SID>X("javaScriptBraces", s:foreground, "", "")
call <SID>X("javaScriptFunction", s:purple, "", "")
call <SID>X("javaScriptConditional", s:purple, "", "")
call <SID>X("javaScriptRepeat", s:purple, "", "")
call <SID>X("javaScriptNumber", s:orange, "", "")
- call <SID>X("javaScriptMember", s:orange, "", "")
+ call <SID>X("javaScriptMember", s:orange, "", "")
+
+ " Diff Highlighting
+ call <SID>X("diffAdded", s:green, "", "")
+ call <SID>X("diffRemoved", s:red, "", "")
" Delete Functions
delf <SID>X
@@ -324,4 +335,4 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
delf <SID>grey_colour
delf <SID>grey_level
delf <SID>grey_number
-endif
+endif
@@ -233,20 +233,23 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
" Vim Highlighting
call <SID>X("Normal", s:foreground, s:background, "")
- call <SID>X("LineNr", s:foreground, s:line, "")
+ call <SID>X("LineNr", s:selection, "", "")
call <SID>X("NonText", s:selection, "", "")
call <SID>X("SpecialKey", s:selection, "", "")
call <SID>X("Search", s:background, s:yellow, "")
call <SID>X("TabLine", s:foreground, s:background, "reverse")
- call <SID>X("StatusLine", s:foreground, s:background, "reverse")
- call <SID>X("StatusLineNC", s:foreground, s:background, "reverse")
- call <SID>X("VertSplit", s:foreground, s:foreground, "")
+ call <SID>X("StatusLine", s:window, s:yellow, "reverse")
+ call <SID>X("StatusLineNC", s:window, s:foreground, "reverse")
+ call <SID>X("VertSplit", s:window, s:window, "none")
call <SID>X("Visual", "", s:selection, "")
call <SID>X("Directory", s:blue, "", "")
call <SID>X("ModeMsg", s:green, "", "")
call <SID>X("MoreMsg", s:green, "", "")
call <SID>X("Question", s:green, "", "")
call <SID>X("WarningMsg", s:red, "", "")
+ call <SID>X("MatchParen", "", s:selection, "")
+ call <SID>X("Folded", s:comment, s:background, "")
+ call <SID>X("FoldColumn", "", s:background, "")
if version >= 700
call <SID>X("CursorLine", "", s:line, "none")
call <SID>X("CursorColumn", "", s:line, "none")
@@ -259,7 +262,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
" Standard Highlighting
call <SID>X("Comment", s:comment, "", "")
- call <SID>X("Todo", s:comment, "", "")
+ call <SID>X("Todo", s:comment, s:background, "")
call <SID>X("Title", s:comment, "", "")
call <SID>X("Identifier", s:red, "", "none")
call <SID>X("Statement", s:foreground, "", "")
@@ -274,9 +277,9 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("Operator", s:aqua, "", "none")
call <SID>X("Type", s:blue, "", "none")
call <SID>X("Define", s:purple, "", "none")
- call <SID>X("Include", s:blue, "", "")
+ call <SID>X("Include", s:blue, "", "")
"call <SID>X("Ignore", "666666", "", "")
-
+
" Vim Highlighting
call <SID>X("vimCommand", s:red, "", "none")
@@ -291,28 +294,36 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("phpConditional", s:purple, "", "")
call <SID>X("phpStatement", s:purple, "", "")
call <SID>X("phpMemberSelector", s:foreground, "", "")
-
+
" Ruby Highlighting
call <SID>X("rubySymbol", s:green, "", "")
call <SID>X("rubyConstant", s:yellow, "", "")
call <SID>X("rubyAttribute", s:blue, "", "")
call <SID>X("rubyInclude", s:blue, "", "")
call <SID>X("rubyLocalVariableOrMethod", s:orange, "", "")
call <SID>X("rubyCurlyBlock", s:orange, "", "")
-
+ call <SID>X("rubyStringDelimiter", s:green, "", "")
+ call <SID>X("rubyInterpolationDelimiter", s:orange, "", "")
+ call <SID>X("rubyConditional", s:purple, "", "")
+ call <SID>X("rubyRepeat", s:purple, "", "")
+
" Python Highlighting
call <SID>X("pythonInclude", s:purple, "", "")
call <SID>X("pythonStatement", s:purple, "", "")
call <SID>X("pythonConditional", s:purple, "", "")
call <SID>X("pythonFunction", s:blue, "", "")
-
+
" JavaScript Highlighting
call <SID>X("javaScriptBraces", s:foreground, "", "")
call <SID>X("javaScriptFunction", s:purple, "", "")
call <SID>X("javaScriptConditional", s:purple, "", "")
call <SID>X("javaScriptRepeat", s:purple, "", "")
call <SID>X("javaScriptNumber", s:orange, "", "")
- call <SID>X("javaScriptMember", s:orange, "", "")
+ call <SID>X("javaScriptMember", s:orange, "", "")
+
+ " Diff Highlighting
+ call <SID>X("diffAdded", s:green, "", "")
+ call <SID>X("diffRemoved", s:red, "", "")
" Delete Functions
delf <SID>X
@@ -324,4 +335,4 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
delf <SID>grey_colour
delf <SID>grey_level
delf <SID>grey_number
-endif
+endif
@@ -257,6 +257,8 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("Question", s:green, "", "")
call <SID>X("WarningMsg", s:red, "", "")
call <SID>X("MatchParen", "", s:selection, "")
+ call <SID>X("Folded", s:comment, s:background, "")
+ call <SID>X("FoldColumn", "", s:background, "")
if version >= 700
call <SID>X("CursorLine", "", s:line, "none")
call <SID>X("CursorColumn", "", s:line, "none")
@@ -342,4 +344,4 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
delf <SID>grey_colour
delf <SID>grey_level
delf <SID>grey_number
-endif
+endif
Oops, something went wrong.

2 comments on commit 0893eef

Contributor

programble replied Nov 29, 2011

The other themes now use s:window but do not define it.

Owner

chriskempson replied Dec 1, 2011

Ah yes... I'll get onto that sorry.

Please sign in to comment.