aboutsummaryrefslogtreecommitdiff
path: root/colors
diff options
context:
space:
mode:
authorChris Kempson <git@chriskempson.com>2016-06-25 17:48:23 +0100
committerChris Kempson <git@chriskempson.com>2016-06-25 17:48:23 +0100
commit9daeb991ee51977c3deea4b45846abfab34e9439 (patch)
tree0c37af08000b10997bedb3fd360a605bde2fd54b /colors
parent0554ca5b2147623d399acca786c50fa5f101155d (diff)
Restructured for multiple template file support
Diffstat (limited to 'colors')
-rw-r--r--colors/base16-eighties.vim345
-rw-r--r--colors/base16-green-screen.vim273
-rw-r--r--colors/base16-mocha.vim345
-rw-r--r--colors/base16-ocean.vim345
4 files changed, 744 insertions, 564 deletions
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index 80e653d..edd4aaa 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -1,5 +1,6 @@
-" Base16 Eighties (https://github.com/chriskempson/base16)
-" Scheme: Chris Kempson (http://chriskempson.com)
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Eighties scheme by Chris Kempson (http://chriskempson.com)
" This enables the coresponding base16-shell script to run so that
" :colorscheme works in terminals supported by base16-shell scripts
@@ -62,237 +63,205 @@ syntax reset
let g:colors_name = "base16-eighties"
" Highlighting function
-fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
if a:guifg != ""
- exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+ exec "hi " . a:group . " guifg=#" . a:guifg
endif
if a:guibg != ""
- exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+ exec "hi " . a:group . " guibg=#" . a:guibg
endif
if a:ctermfg != ""
- exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+ exec "hi " . a:group . " ctermfg=" . a:ctermfg
endif
if a:ctermbg != ""
- exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+ exec "hi " . a:group . " ctermbg=" . a:ctermbg
endif
if a:attr != ""
exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
endif
-endfun
-
-" Return GUI color for light/dark variants
-fun s:gui(color)
- if &background == "dark"
- return a:color
- endif
-
- if a:color == s:gui00
- return s:gui07
- elseif a:color == s:gui01
- return s:gui06
- elseif a:color == s:gui02
- return s:gui05
- elseif a:color == s:gui03
- return s:gui04
- elseif a:color == s:gui04
- return s:gui03
- elseif a:color == s:gui05
- return s:gui02
- elseif a:color == s:gui06
- return s:gui01
- elseif a:color == s:gui07
- return s:gui00
- endif
-
- return a:color
-endfun
-
-" Return terminal color for light/dark variants
-fun s:cterm(color)
- if &background == "dark"
- return a:color
- endif
-
- if a:color == s:cterm00
- return s:cterm07
- elseif a:color == s:cterm01
- return s:cterm06
- elseif a:color == s:cterm02
- return s:cterm05
- elseif a:color == s:cterm03
- return s:cterm04
- elseif a:color == s:cterm04
- return s:cterm03
- elseif a:color == s:cterm05
- return s:cterm02
- elseif a:color == s:cterm06
- return s:cterm01
- elseif a:color == s:cterm07
- return s:cterm00
+ if a:guisp != ""
+ exec "hi " . a:group . " guisp=#" . a:guisp
endif
-
- return a:color
endfun
" Vim editor colors
-call <sid>hi("Bold", "", "", "", "", "bold")
-call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("FoldColumn", "", s:gui01, "", s:cterm01, "")
-call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none")
-call <sid>hi("Italic", "", "", "", "", "none")
-call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "")
-call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "")
-call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "")
-call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("WildMenu", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none")
-call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "")
-call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
-call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
-call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
-call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
-call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none")
-call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none")
-call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none")
-call <sid>hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "")
-call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
-call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
-call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+call <sid>hi("Bold", "", "", "", "", "bold", "")
+call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic", "", "", "", "", "none", "")
+call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "")
+call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "")
+call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "")
+call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
" Standard syntax highlighting
-call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Character", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none")
-call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("Float", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none")
-call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Number", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none")
-call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
-call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "")
" C highlighting
-call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "")
+
+" C# highlighting
+call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "")
" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "")
" Diff highlighting
-call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "")
+
" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
" HTML highlighting
-call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "")
" JavaScript highlighting
-call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "")
+
+" Mail highlighting
+call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "")
" Markdown highlighting
-call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
-call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "")
" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "")
" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "")
" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "")
" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "")
" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "")
" Signify highlighting
-call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
" Remove functions
delf <sid>hi
@@ -301,4 +270,4 @@ delf <sid>cterm
" Remove color variables
unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file
diff --git a/colors/base16-green-screen.vim b/colors/base16-green-screen.vim
new file mode 100644
index 0000000..8487697
--- /dev/null
+++ b/colors/base16-green-screen.vim
@@ -0,0 +1,273 @@
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Green Screen scheme by Chris Kempson (http://chriskempson.com)
+
+" This enables the coresponding base16-shell script to run so that
+" :colorscheme works in terminals supported by base16-shell scripts
+" User must set this variable in .vimrc
+" let g:base16_shell_path=base16-builder/output/shell/
+if !has('gui_running')
+ if exists("g:base16_shell_path")
+ execute "silent !/bin/sh ".g:base16_shell_path."/base16-green-screen.".&background.".sh"
+ endif
+endif
+
+" GUI color definitions
+let s:gui00 = "001100"
+let s:gui01 = "003300"
+let s:gui02 = "005500"
+let s:gui03 = "007700"
+let s:gui04 = "009900"
+let s:gui05 = "00bb00"
+let s:gui06 = "00dd00"
+let s:gui07 = "00ff00"
+let s:gui08 = "007700"
+let s:gui09 = "009900"
+let s:gui0A = "007700"
+let s:gui0B = "00bb00"
+let s:gui0C = "005500"
+let s:gui0D = "009900"
+let s:gui0E = "00bb00"
+let s:gui0F = "005500"
+
+" Terminal color definitions
+let s:cterm00 = "00"
+let s:cterm03 = "08"
+let s:cterm05 = "07"
+let s:cterm07 = "15"
+let s:cterm08 = "01"
+let s:cterm0A = "03"
+let s:cterm0B = "02"
+let s:cterm0C = "06"
+let s:cterm0D = "04"
+let s:cterm0E = "05"
+if exists('base16colorspace') && base16colorspace == "256"
+ let s:cterm01 = "18"
+ let s:cterm02 = "19"
+ let s:cterm04 = "20"
+ let s:cterm06 = "21"
+ let s:cterm09 = "16"
+ let s:cterm0F = "17"
+else
+ let s:cterm01 = "10"
+ let s:cterm02 = "11"
+ let s:cterm04 = "12"
+ let s:cterm06 = "13"
+ let s:cterm09 = "09"
+ let s:cterm0F = "14"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-green-screen"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+ if a:guifg != ""
+ exec "hi " . a:group . " guifg=#" . a:guifg
+ endif
+ if a:guibg != ""
+ exec "hi " . a:group . " guibg=#" . a:guibg
+ endif
+ if a:ctermfg != ""
+ exec "hi " . a:group . " ctermfg=" . a:ctermfg
+ endif
+ if a:ctermbg != ""
+ exec "hi " . a:group . " ctermbg=" . a:ctermbg
+ endif
+ if a:attr != ""
+ exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+ endif
+ if a:guisp != ""
+ exec "hi " . a:group . " guisp=#" . a:guisp
+ endif
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold", "", "", "", "", "bold", "")
+call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic", "", "", "", "", "none", "")
+call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "")
+call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "")
+call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "")
+call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "")
+
+" C highlighting
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "")
+
+" C# highlighting
+call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "")
+
+" Diff highlighting
+call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "")
+
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "")
+
+" Mail highlighting
+call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "")
+
+" NERDTree highlighting
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "")
+
+" Python highlighting
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index b643f06..664f68d 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -1,5 +1,6 @@
-" Base16 Mocha (https://github.com/chriskempson/base16)
-" Scheme: Chris Kempson (http://chriskempson.com)
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Mocha scheme by Chris Kempson (http://chriskempson.com)
" This enables the coresponding base16-shell script to run so that
" :colorscheme works in terminals supported by base16-shell scripts
@@ -62,237 +63,205 @@ syntax reset
let g:colors_name = "base16-mocha"
" Highlighting function
-fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
if a:guifg != ""
- exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+ exec "hi " . a:group . " guifg=#" . a:guifg
endif
if a:guibg != ""
- exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+ exec "hi " . a:group . " guibg=#" . a:guibg
endif
if a:ctermfg != ""
- exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+ exec "hi " . a:group . " ctermfg=" . a:ctermfg
endif
if a:ctermbg != ""
- exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+ exec "hi " . a:group . " ctermbg=" . a:ctermbg
endif
if a:attr != ""
exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
endif
-endfun
-
-" Return GUI color for light/dark variants
-fun s:gui(color)
- if &background == "dark"
- return a:color
- endif
-
- if a:color == s:gui00
- return s:gui07
- elseif a:color == s:gui01
- return s:gui06
- elseif a:color == s:gui02
- return s:gui05
- elseif a:color == s:gui03
- return s:gui04
- elseif a:color == s:gui04
- return s:gui03
- elseif a:color == s:gui05
- return s:gui02
- elseif a:color == s:gui06
- return s:gui01
- elseif a:color == s:gui07
- return s:gui00
- endif
-
- return a:color
-endfun
-
-" Return terminal color for light/dark variants
-fun s:cterm(color)
- if &background == "dark"
- return a:color
- endif
-
- if a:color == s:cterm00
- return s:cterm07
- elseif a:color == s:cterm01
- return s:cterm06
- elseif a:color == s:cterm02
- return s:cterm05
- elseif a:color == s:cterm03
- return s:cterm04
- elseif a:color == s:cterm04
- return s:cterm03
- elseif a:color == s:cterm05
- return s:cterm02
- elseif a:color == s:cterm06
- return s:cterm01
- elseif a:color == s:cterm07
- return s:cterm00
+ if a:guisp != ""
+ exec "hi " . a:group . " guisp=#" . a:guisp
endif
-
- return a:color
endfun
" Vim editor colors
-call <sid>hi("Bold", "", "", "", "", "bold")
-call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("FoldColumn", "", s:gui01, "", s:cterm01, "")
-call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none")
-call <sid>hi("Italic", "", "", "", "", "none")
-call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "")
-call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "")
-call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "")
-call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("WildMenu", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none")
-call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "")
-call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
-call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
-call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
-call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
-call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none")
-call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none")
-call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none")
-call <sid>hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "")
-call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
-call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
-call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+call <sid>hi("Bold", "", "", "", "", "bold", "")
+call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic", "", "", "", "", "none", "")
+call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "")
+call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "")
+call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "")
+call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
" Standard syntax highlighting
-call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Character", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none")
-call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("Float", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none")
-call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Number", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none")
-call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
-call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "")
" C highlighting
-call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "")
+
+" C# highlighting
+call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "")
" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "")
" Diff highlighting
-call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "")
+
" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
" HTML highlighting
-call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "")
" JavaScript highlighting
-call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "")
+
+" Mail highlighting
+call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "")
" Markdown highlighting
-call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
-call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "")
" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "")
" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "")
" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "")
" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "")
" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "")
" Signify highlighting
-call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
" Remove functions
delf <sid>hi
@@ -301,4 +270,4 @@ delf <sid>cterm
" Remove color variables
unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index 6632835..05cbd6e 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -1,5 +1,6 @@
-" Base16 Ocean (https://github.com/chriskempson/base16)
-" Scheme: Chris Kempson (http://chriskempson.com)
+" base16-vim (https://github.com/chriskempson/base16-vim)
+" by Chris Kempson (http://chriskempson.com)
+" Ocean scheme by Chris Kempson (http://chriskempson.com)
" This enables the coresponding base16-shell script to run so that
" :colorscheme works in terminals supported by base16-shell scripts
@@ -62,237 +63,205 @@ syntax reset
let g:colors_name = "base16-ocean"
" Highlighting function
-fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
if a:guifg != ""
- exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+ exec "hi " . a:group . " guifg=#" . a:guifg
endif
if a:guibg != ""
- exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+ exec "hi " . a:group . " guibg=#" . a:guibg
endif
if a:ctermfg != ""
- exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+ exec "hi " . a:group . " ctermfg=" . a:ctermfg
endif
if a:ctermbg != ""
- exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+ exec "hi " . a:group . " ctermbg=" . a:ctermbg
endif
if a:attr != ""
exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
endif
-endfun
-
-" Return GUI color for light/dark variants
-fun s:gui(color)
- if &background == "dark"
- return a:color
- endif
-
- if a:color == s:gui00
- return s:gui07
- elseif a:color == s:gui01
- return s:gui06
- elseif a:color == s:gui02
- return s:gui05
- elseif a:color == s:gui03
- return s:gui04
- elseif a:color == s:gui04
- return s:gui03
- elseif a:color == s:gui05
- return s:gui02
- elseif a:color == s:gui06
- return s:gui01
- elseif a:color == s:gui07
- return s:gui00
- endif
-
- return a:color
-endfun
-
-" Return terminal color for light/dark variants
-fun s:cterm(color)
- if &background == "dark"
- return a:color
- endif
-
- if a:color == s:cterm00
- return s:cterm07
- elseif a:color == s:cterm01
- return s:cterm06
- elseif a:color == s:cterm02
- return s:cterm05
- elseif a:color == s:cterm03
- return s:cterm04
- elseif a:color == s:cterm04
- return s:cterm03
- elseif a:color == s:cterm05
- return s:cterm02
- elseif a:color == s:cterm06
- return s:cterm01
- elseif a:color == s:cterm07
- return s:cterm00
+ if a:guisp != ""
+ exec "hi " . a:group . " guisp=#" . a:guisp
endif
-
- return a:color
endfun
" Vim editor colors
-call <sid>hi("Bold", "", "", "", "", "bold")
-call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("FoldColumn", "", s:gui01, "", s:cterm01, "")
-call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none")
-call <sid>hi("Italic", "", "", "", "", "none")
-call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "")
-call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "")
-call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "")
-call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("WildMenu", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none")
-call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "")
-call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
-call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
-call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
-call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
-call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none")
-call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none")
-call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none")
-call <sid>hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "")
-call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
-call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
-call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+call <sid>hi("Bold", "", "", "", "", "bold", "")
+call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "")
+call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "")
+call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "")
+call <sid>hi("Italic", "", "", "", "", "none", "")
+call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "", "")
+call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "", "")
+call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "")
+call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "")
+call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "")
+call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "")
+call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "")
+call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "")
+call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "")
+call <sid>hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none", "")
+call <sid>hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "", "")
+call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "")
+call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "")
" Standard syntax highlighting
-call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Character", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "")
-call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none")
-call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("Float", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none")
-call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Number", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none")
-call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
-call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none")
-call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "")
+call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "")
+call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "")
+call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "")
+call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "")
+call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "")
+call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "")
" C highlighting
-call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "")
+
+" C# highlighting
+call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "")
" CSS highlighting
-call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "")
" Diff highlighting
-call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
-call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
-call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
-call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "")
+call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
+call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "")
+call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "")
+call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "")
" Git highlighting
-call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "")
-
+call <sid>hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "", "")
+
" GitGutter highlighting
-call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
-call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "")
+call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
+call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "")
" HTML highlighting
-call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "")
" JavaScript highlighting
-call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "")
+call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "")
+
+" Mail highlighting
+call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "")
" Markdown highlighting
-call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "")
-call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "")
+call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "")
" NERDTree highlighting
-call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "")
" PHP highlighting
-call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "")
-call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "")
+call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "")
" Python highlighting
-call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "")
" Ruby highlighting
-call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "")
-call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "")
-call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "")
-call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "")
-call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "")
+call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "")
+call <sid>hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "")
+call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "")
+call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "")
+call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "")
" SASS highlighting
-call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "")
-call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "")
-call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "")
-call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "")
+call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "")
+call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "")
+call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "")
" Signify highlighting
-call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
-call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
-call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "")
+call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "")
+call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "")
" Spelling highlighting
-call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl")
-call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl", s:gui08)
+call <sid>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl", s:gui0C)
+call <sid>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl", s:gui0D)
+call <sid>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl", s:gui0E)
" Remove functions
delf <sid>hi
@@ -301,4 +270,4 @@ delf <sid>cterm
" Remove color variables
unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F \ No newline at end of file