From f47e46856a691d8daaf3a8f64547a714f13031bd Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Tue, 10 Mar 2015 14:42:26 -0700 Subject: [PATCH] the night is on my mind --- .gitignore | 2 + home/vimrc | 24 +- vim/colors/Tomorrow-Night.vim | 704 ++++++++++++---------------------- 3 files changed, 264 insertions(+), 466 deletions(-) diff --git a/.gitignore b/.gitignore index c9c23ff..b829cb7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ ssh/* !ssh/known_hosts !ssh/crawl vim/backup/* +vim/swp/* vim/.* +vim/bundle/* *.swp *.swo diff --git a/home/vimrc b/home/vimrc index 9627a9f..e234c70 100644 --- a/home/vimrc +++ b/home/vimrc @@ -1,5 +1,6 @@ " vim:cc=79,39 " make vim unusable for anyone else +" from the get-go, we assume version >= 703 set nocompatible " screw vi @@ -180,6 +181,8 @@ Inn Inn Inn :m-2 Inn :m+1 +Inn :tabm -1 +Inn :tabm +1 " hide search highlighting Inn :nohls @@ -204,19 +207,22 @@ Inn X nn p "0p nn P "0P nn e :tabe +nn d :cd %:p:h:pwd nn . @: +"nn ? :exec getline(".") +nn , :Tab /,\zs "nn x :system('chmod +x %') | e +" +nn , :Tab /,\zs +nn s :call SyntaxAttr() +nn 1 :colo property +nn 2 :colo clearance +nn 3 :colo Tomorrow-Night " misc {{{1 -if v:version < 703 " even debian stable has 7.3, so... - set nomodeline -else - if &termencoding == "utf-8" - set list listchars=tab:»·,trail:·,extends:…,nbsp:‗ - else - set list listchars=tab:>-,trail:.,extends:>,nbsp:_ - endif -endif +set list listchars=tab:»·,trail:·,extends:…,nbsp:‗ +" including this in case i'm on a _really_ bad terminal: +"set list listchars=tab:>-,trail:.,extends:>,nbsp:_ try | execute pathogen#infect() | catch /E117/ | endtry diff --git a/vim/colors/Tomorrow-Night.vim b/vim/colors/Tomorrow-Night.vim index f8e5833..c3f5e90 100644 --- a/vim/colors/Tomorrow-Night.vim +++ b/vim/colors/Tomorrow-Night.vim @@ -1,29 +1,29 @@ " Tomorrow Night - Full Colour and 256 Colour " http://chriskempson.com " -" Hex colour conversion functions borrowed from the theme "Desert256"" +" Hex colour conversion functions were stripped out in favor of csapprox " Default GUI Colours let s:foreground = "c5c8c6" let s:background = "1d1f21" -let s:selection = "373b41" -let s:line = "282a2e" -let s:comment = "969896" -let s:red = "cc6666" -let s:orange = "de935f" -let s:yellow = "f0c674" -let s:green = "b5bd68" -let s:aqua = "8abeb7" -let s:blue = "81a2be" -let s:purple = "b294bb" -let s:window = "4d5057" +let s:selection = "373b41" +let s:line = "282a2e" +let s:comment = "969896" +let s:red = "cc6666" +let s:orange = "de935f" +let s:yellow = "f0c674" +let s:green = "b5bd68" +let s:aqua = "8abeb7" +let s:blue = "81a2be" +let s:purple = "b294bb" +let s:window = "4d5057" " Console 256 Colours if !has("gui_running") let s:background = "303030" - let s:window = "5e5e5e" - let s:line = "3a3a3a" - let s:selection = "585858" + let s:window = "5e5e5e" + let s:line = "3a3a3a" + let s:selection = "585858" end hi clear @@ -31,467 +31,257 @@ syntax reset let g:colors_name = "Tomorrow-Night" -if has("gui_running") || &t_Co == 88 || &t_Co == 256 - " Returns an approximate grey index for the given grey level - fun grey_number(x) - if &t_Co == 88 - if a:x < 23 - return 0 - elseif a:x < 69 - return 1 - elseif a:x < 103 - return 2 - elseif a:x < 127 - return 3 - elseif a:x < 150 - return 4 - elseif a:x < 173 - return 5 - elseif a:x < 196 - return 6 - elseif a:x < 219 - return 7 - elseif a:x < 243 - return 8 - else - return 9 - endif - else - if a:x < 14 - return 0 - else - let l:n = (a:x - 8) / 10 - let l:m = (a:x - 8) % 10 - if l:m < 5 - return l:n - else - return l:n + 1 - endif - endif - endif - endfun +" Sets the highlighting for the given group +fun X(group, fg, bg, attr) + if a:fg != "" | exec "hi " . a:group . " guifg=#" . a:fg | endif + if a:bg != "" | exec "hi " . a:group . " guibg=#" . a:bg | endif + if a:attr != "" | exec "hi " . a:group . " gui=" . a:attr | endif +endfun - " Returns the actual grey level represented by the grey index - fun grey_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 46 - elseif a:n == 2 - return 92 - elseif a:n == 3 - return 115 - elseif a:n == 4 - return 139 - elseif a:n == 5 - return 162 - elseif a:n == 6 - return 185 - elseif a:n == 7 - return 208 - elseif a:n == 8 - return 231 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 8 + (a:n * 10) - endif - endif - endfun +" Vim Highlighting +call X("Normal", s:foreground, s:background, "") +call X("LineNr", s:selection, "", "") +call X("NonText", s:selection, "", "") +call X("SpecialKey", s:selection, "", "") +call X("Search", s:background, s:yellow, "") +call X("TabLine", s:window, s:foreground, "reverse") +call X("TabLineFill", s:window, s:foreground, "reverse") +call X("StatusLine", s:window, s:yellow, "reverse") +call X("StatusLineNC", s:window, s:foreground, "reverse") +call X("VertSplit", s:window, s:window, "none") +call X("Visual", "", s:selection, "") +call X("Directory", s:blue, "", "") +call X("ModeMsg", s:green, "", "") +call X("MoreMsg", s:green, "", "") +call X("Question", s:green, "", "") +call X("WarningMsg", s:red, "", "") +call X("MatchParen", "", s:selection, "") +call X("Folded", s:comment, s:background, "") +call X("FoldColumn", "", s:background, "") +if version >= 700 + call X("CursorLine", "", s:line, "none") + call X("CursorColumn", "", s:line, "none") + call X("PMenu", s:foreground, s:selection, "none") + call X("PMenuSel", s:foreground, s:selection, "reverse") + call X("SignColumn", "", s:background, "none") +end +if version >= 703 + call X("ColorColumn", "", s:line, "none") +end - " Returns the palette index for the given grey index - fun grey_colour(n) - if &t_Co == 88 - if a:n == 0 - return 16 - elseif a:n == 9 - return 79 - else - return 79 + a:n - endif - else - if a:n == 0 - return 16 - elseif a:n == 25 - return 231 - else - return 231 + a:n - endif - endif - endfun +" Standard Highlighting +call X("Comment", s:comment, "", "") +call X("Todo", s:comment, s:background, "") +call X("Title", s:comment, "", "") +call X("Identifier", s:red, "", "none") +call X("Statement", s:foreground, "", "") +call X("Conditional", s:foreground, "", "") +call X("Repeat", s:foreground, "", "") +call X("Structure", s:purple, "", "") +call X("Function", s:blue, "", "") +call X("Constant", s:orange, "", "") +call X("Keyword", s:orange, "", "") +call X("String", s:green, "", "") +call X("Special", s:foreground, "", "") +call X("PreProc", s:purple, "", "") +call X("Operator", s:aqua, "", "none") +call X("Type", s:blue, "", "none") +call X("Define", s:purple, "", "none") +call X("Include", s:blue, "", "") +"call X("Ignore", "666666", "", "") - " Returns an approximate colour index for the given colour level - fun rgb_number(x) - if &t_Co == 88 - if a:x < 69 - return 0 - elseif a:x < 172 - return 1 - elseif a:x < 230 - return 2 - else - return 3 - endif - else - if a:x < 75 - return 0 - else - let l:n = (a:x - 55) / 40 - let l:m = (a:x - 55) % 40 - if l:m < 20 - return l:n - else - return l:n + 1 - endif - endif - endif - endfun +" Vim Highlighting +call X("vimCommand", s:red, "", "none") - " Returns the actual colour level for the given colour index - fun rgb_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 139 - elseif a:n == 2 - return 205 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 55 + (a:n * 40) - endif - endif - endfun +" C Highlighting +call X("cType", s:yellow, "", "") +call X("cStorageClass", s:purple, "", "") +call X("cConditional", s:purple, "", "") +call X("cRepeat", s:purple, "", "") - " Returns the palette index for the given R/G/B colour indices - fun rgb_colour(x, y, z) - if &t_Co == 88 - return 16 + (a:x * 16) + (a:y * 4) + a:z - else - return 16 + (a:x * 36) + (a:y * 6) + a:z - endif - endfun +" PHP Highlighting +call X("phpVarSelector", s:red, "", "") +call X("phpKeyword", s:purple, "", "") +call X("phpRepeat", s:purple, "", "") +call X("phpConditional", s:purple, "", "") +call X("phpStatement", s:purple, "", "") +call X("phpMemberSelector", s:foreground, "", "") - " Returns the palette index to approximate the given R/G/B colour levels - fun colour(r, g, b) - " Get the closest grey - let l:gx = grey_number(a:r) - let l:gy = grey_number(a:g) - let l:gz = grey_number(a:b) +" Ruby Highlighting +call X("rubySymbol", s:green, "", "") +call X("rubyConstant", s:yellow, "", "") +call X("rubyAccess", s:yellow, "", "") +call X("rubyAttribute", s:blue, "", "") +call X("rubyInclude", s:blue, "", "") +call X("rubyLocalVariableOrMethod", s:orange, "", "") +call X("rubyCurlyBlock", s:orange, "", "") +call X("rubyStringDelimiter", s:green, "", "") +call X("rubyInterpolationDelimiter", s:orange, "", "") +call X("rubyConditional", s:purple, "", "") +call X("rubyRepeat", s:purple, "", "") +call X("rubyControl", s:purple, "", "") +call X("rubyException", s:purple, "", "") - " Get the closest colour - let l:x = rgb_number(a:r) - let l:y = rgb_number(a:g) - let l:z = rgb_number(a:b) +" Crystal Highlighting +call X("crystalSymbol", s:green, "", "") +call X("crystalConstant", s:yellow, "", "") +call X("crystalAccess", s:yellow, "", "") +call X("crystalAttribute", s:blue, "", "") +call X("crystalInclude", s:blue, "", "") +call X("crystalLocalVariableOrMethod", s:orange, "", "") +call X("crystalCurlyBlock", s:orange, "", "") +call X("crystalStringDelimiter", s:green, "", "") +call X("crystalInterpolationDelimiter", s:orange, "", "") +call X("crystalConditional", s:purple, "", "") +call X("crystalRepeat", s:purple, "", "") +call X("crystalControl", s:purple, "", "") +call X("crystalException", s:purple, "", "") - if l:gx == l:gy && l:gy == l:gz - " There are two possibilities - let l:dgr = grey_level(l:gx) - a:r - let l:dgg = grey_level(l:gy) - a:g - let l:dgb = grey_level(l:gz) - a:b - let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) - let l:dr = rgb_level(l:gx) - a:r - let l:dg = rgb_level(l:gy) - a:g - let l:db = rgb_level(l:gz) - a:b - let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db) - if l:dgrey < l:drgb - " Use the grey - return grey_colour(l:gx) - else - " Use the colour - return rgb_colour(l:x, l:y, l:z) - endif - else - " Only one possibility - return rgb_colour(l:x, l:y, l:z) - endif - endfun +" Python Highlighting +call X("pythonInclude", s:purple, "", "") +call X("pythonStatement", s:purple, "", "") +call X("pythonConditional", s:purple, "", "") +call X("pythonRepeat", s:purple, "", "") +call X("pythonException", s:purple, "", "") +call X("pythonFunction", s:blue, "", "") +call X("pythonPreCondit", s:purple, "", "") +call X("pythonRepeat", s:aqua, "", "") +call X("pythonExClass", s:orange, "", "") - " Returns the palette index to approximate the 'rrggbb' hex string - fun rgb(rgb) - let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0 - let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0 - let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0 +" JavaScript Highlighting +call X("javaScriptBraces", s:foreground, "", "") +call X("javaScriptFunction", s:purple, "", "") +call X("javaScriptConditional", s:purple, "", "") +call X("javaScriptRepeat", s:purple, "", "") +call X("javaScriptNumber", s:orange, "", "") +call X("javaScriptMember", s:orange, "", "") +call X("javascriptNull", s:orange, "", "") +call X("javascriptGlobal", s:blue, "", "") +call X("javascriptStatement", s:red, "", "") - return colour(l:r, l:g, l:b) - endfun +" CoffeeScript Highlighting +call X("coffeeRepeat", s:purple, "", "") +call X("coffeeConditional", s:purple, "", "") +call X("coffeeKeyword", s:purple, "", "") +call X("coffeeObject", s:yellow, "", "") - " Sets the highlighting for the given group - fun X(group, fg, bg, attr) - if a:fg != "" - exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . rgb(a:fg) - endif - if a:bg != "" - exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . rgb(a:bg) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif - endfun +" HTML Highlighting +call X("htmlTag", s:red, "", "") +call X("htmlTagName", s:red, "", "") +call X("htmlArg", s:red, "", "") +call X("htmlScriptTag", s:red, "", "") - " Vim Highlighting - call X("Normal", s:foreground, s:background, "") - call X("LineNr", s:selection, "", "") - call X("NonText", s:selection, "", "") - call X("SpecialKey", s:selection, "", "") - call X("Search", s:background, s:yellow, "") - call X("TabLine", s:window, s:foreground, "reverse") - call X("TabLineFill", s:window, s:foreground, "reverse") - call X("StatusLine", s:window, s:yellow, "reverse") - call X("StatusLineNC", s:window, s:foreground, "reverse") - call X("VertSplit", s:window, s:window, "none") - call X("Visual", "", s:selection, "") - call X("Directory", s:blue, "", "") - call X("ModeMsg", s:green, "", "") - call X("MoreMsg", s:green, "", "") - call X("Question", s:green, "", "") - call X("WarningMsg", s:red, "", "") - call X("MatchParen", "", s:selection, "") - call X("Folded", s:comment, s:background, "") - call X("FoldColumn", "", s:background, "") - if version >= 700 - call X("CursorLine", "", s:line, "none") - call X("CursorColumn", "", s:line, "none") - call X("PMenu", s:foreground, s:selection, "none") - call X("PMenuSel", s:foreground, s:selection, "reverse") - call X("SignColumn", "", s:background, "none") - end - if version >= 703 - call X("ColorColumn", "", s:line, "none") - end +" Diff Highlighting +call X("diffAdd", "", "4c4e39", "") +call X("diffDelete", s:background, s:red, "") +call X("diffChange", "", "2B5B77", "") +call X("diffText", s:line, s:blue, "") - " Standard Highlighting - call X("Comment", s:comment, "", "") - call X("Todo", s:comment, s:background, "") - call X("Title", s:comment, "", "") - call X("Identifier", s:red, "", "none") - call X("Statement", s:foreground, "", "") - call X("Conditional", s:foreground, "", "") - call X("Repeat", s:foreground, "", "") - call X("Structure", s:purple, "", "") - call X("Function", s:blue, "", "") - call X("Constant", s:orange, "", "") - call X("Keyword", s:orange, "", "") - call X("String", s:green, "", "") - call X("Special", s:foreground, "", "") - call X("PreProc", s:purple, "", "") - call X("Operator", s:aqua, "", "none") - call X("Type", s:blue, "", "none") - call X("Define", s:purple, "", "none") - call X("Include", s:blue, "", "") - "call X("Ignore", "666666", "", "") +" ShowMarks Highlighting +call X("ShowMarksHLl", s:orange, s:background, "none") +call X("ShowMarksHLo", s:purple, s:background, "none") +call X("ShowMarksHLu", s:yellow, s:background, "none") +call X("ShowMarksHLm", s:aqua, s:background, "none") - " Vim Highlighting - call X("vimCommand", s:red, "", "none") +" Lua Highlighting +call X("luaStatement", s:purple, "", "") +call X("luaRepeat", s:purple, "", "") +call X("luaCondStart", s:purple, "", "") +call X("luaCondElseif", s:purple, "", "") +call X("luaCond", s:purple, "", "") +call X("luaCondEnd", s:purple, "", "") - " C Highlighting - call X("cType", s:yellow, "", "") - call X("cStorageClass", s:purple, "", "") - call X("cConditional", s:purple, "", "") - call X("cRepeat", s:purple, "", "") +" Cucumber Highlighting +call X("cucumberGiven", s:blue, "", "") +call X("cucumberGivenAnd", s:blue, "", "") - " PHP Highlighting - call X("phpVarSelector", s:red, "", "") - call X("phpKeyword", s:purple, "", "") - call X("phpRepeat", s:purple, "", "") - call X("phpConditional", s:purple, "", "") - call X("phpStatement", s:purple, "", "") - call X("phpMemberSelector", s:foreground, "", "") +" Go Highlighting +call X("goDirective", s:purple, "", "") +call X("goDeclaration", s:purple, "", "") +call X("goStatement", s:purple, "", "") +call X("goConditional", s:purple, "", "") +call X("goConstants", s:orange, "", "") +call X("goTodo", s:yellow, "", "") +call X("goDeclType", s:blue, "", "") +call X("goBuiltins", s:purple, "", "") +call X("goRepeat", s:purple, "", "") +call X("goLabel", s:purple, "", "") - " Ruby Highlighting - call X("rubySymbol", s:green, "", "") - call X("rubyConstant", s:yellow, "", "") - call X("rubyAccess", s:yellow, "", "") - call X("rubyAttribute", s:blue, "", "") - call X("rubyInclude", s:blue, "", "") - call X("rubyLocalVariableOrMethod", s:orange, "", "") - call X("rubyCurlyBlock", s:orange, "", "") - call X("rubyStringDelimiter", s:green, "", "") - call X("rubyInterpolationDelimiter", s:orange, "", "") - call X("rubyConditional", s:purple, "", "") - call X("rubyRepeat", s:purple, "", "") - call X("rubyControl", s:purple, "", "") - call X("rubyException", s:purple, "", "") +" Clojure Highlighting +call X("clojureConstant", s:orange, "", "") +call X("clojureBoolean", s:orange, "", "") +call X("clojureCharacter", s:orange, "", "") +call X("clojureKeyword", s:green, "", "") +call X("clojureNumber", s:orange, "", "") +call X("clojureString", s:green, "", "") +call X("clojureRegexp", s:green, "", "") +call X("clojureParen", s:aqua, "", "") +call X("clojureVariable", s:yellow, "", "") +call X("clojureCond", s:blue, "", "") +call X("clojureDefine", s:purple, "", "") +call X("clojureException", s:red, "", "") +call X("clojureFunc", s:blue, "", "") +call X("clojureMacro", s:blue, "", "") +call X("clojureRepeat", s:blue, "", "") +call X("clojureSpecial", s:purple, "", "") +call X("clojureQuote", s:blue, "", "") +call X("clojureUnquote", s:blue, "", "") +call X("clojureMeta", s:blue, "", "") +call X("clojureDeref", s:blue, "", "") +call X("clojureAnonArg", s:blue, "", "") +call X("clojureRepeat", s:blue, "", "") +call X("clojureDispatch", s:blue, "", "") - " Crystal Highlighting - call X("crystalSymbol", s:green, "", "") - call X("crystalConstant", s:yellow, "", "") - call X("crystalAccess", s:yellow, "", "") - call X("crystalAttribute", s:blue, "", "") - call X("crystalInclude", s:blue, "", "") - call X("crystalLocalVariableOrMethod", s:orange, "", "") - call X("crystalCurlyBlock", s:orange, "", "") - call X("crystalStringDelimiter", s:green, "", "") - call X("crystalInterpolationDelimiter", s:orange, "", "") - call X("crystalConditional", s:purple, "", "") - call X("crystalRepeat", s:purple, "", "") - call X("crystalControl", s:purple, "", "") - call X("crystalException", s:purple, "", "") +" Scala Highlighting +call X("scalaKeyword", s:purple, "", "") +call X("scalaKeywordModifier", s:purple, "", "") +call X("scalaOperator", s:blue, "", "") +call X("scalaPackage", s:red, "", "") +call X("scalaFqn", s:foreground, "", "") +call X("scalaFqnSet", s:foreground, "", "") +call X("scalaImport", s:purple, "", "") +call X("scalaBoolean", s:orange, "", "") +call X("scalaDef", s:purple, "", "") +call X("scalaVal", s:purple, "", "") +call X("scalaVar", s:aqua, "", "") +call X("scalaClass", s:purple, "", "") +call X("scalaObject", s:purple, "", "") +call X("scalaTrait", s:purple, "", "") +call X("scalaDefName", s:blue, "", "") +call X("scalaValName", s:foreground, "", "") +call X("scalaVarName", s:foreground, "", "") +call X("scalaClassName", s:foreground, "", "") +call X("scalaType", s:yellow, "", "") +call X("scalaTypeSpecializer", s:yellow, "", "") +call X("scalaAnnotation", s:orange, "", "") +call X("scalaNumber", s:orange, "", "") +call X("scalaDefSpecializer", s:yellow, "", "") +call X("scalaClassSpecializer", s:yellow, "", "") +call X("scalaBackTick", s:green, "", "") +call X("scalaRoot", s:foreground, "", "") +call X("scalaMethodCall", s:blue, "", "") +call X("scalaCaseType", s:yellow, "", "") +call X("scalaLineComment", s:comment, "", "") +call X("scalaComment", s:comment, "", "") +call X("scalaDocComment", s:comment, "", "") +call X("scalaDocTags", s:comment, "", "") +call X("scalaEmptyString", s:green, "", "") +call X("scalaMultiLineString", s:green, "", "") +call X("scalaUnicode", s:orange, "", "") +call X("scalaString", s:green, "", "") +call X("scalaStringEscape", s:green, "", "") +call X("scalaSymbol", s:orange, "", "") +call X("scalaChar", s:orange, "", "") +call X("scalaXml", s:green, "", "") +call X("scalaConstructorSpecializer", s:yellow, "", "") +call X("scalaBackTick", s:blue, "", "") - " Python Highlighting - call X("pythonInclude", s:purple, "", "") - call X("pythonStatement", s:purple, "", "") - call X("pythonConditional", s:purple, "", "") - call X("pythonRepeat", s:purple, "", "") - call X("pythonException", s:purple, "", "") - call X("pythonFunction", s:blue, "", "") - call X("pythonPreCondit", s:purple, "", "") - call X("pythonRepeat", s:aqua, "", "") - call X("pythonExClass", s:orange, "", "") +" Git +call X("diffAdded", s:green, "", "") +call X("diffRemoved", s:red, "", "") +call X("gitcommitSummary", "", "", "bold") - " JavaScript Highlighting - call X("javaScriptBraces", s:foreground, "", "") - call X("javaScriptFunction", s:purple, "", "") - call X("javaScriptConditional", s:purple, "", "") - call X("javaScriptRepeat", s:purple, "", "") - call X("javaScriptNumber", s:orange, "", "") - call X("javaScriptMember", s:orange, "", "") - call X("javascriptNull", s:orange, "", "") - call X("javascriptGlobal", s:blue, "", "") - call X("javascriptStatement", s:red, "", "") - - " CoffeeScript Highlighting - call X("coffeeRepeat", s:purple, "", "") - call X("coffeeConditional", s:purple, "", "") - call X("coffeeKeyword", s:purple, "", "") - call X("coffeeObject", s:yellow, "", "") - - " HTML Highlighting - call X("htmlTag", s:red, "", "") - call X("htmlTagName", s:red, "", "") - call X("htmlArg", s:red, "", "") - call X("htmlScriptTag", s:red, "", "") - - " Diff Highlighting - call X("diffAdd", "", "4c4e39", "") - call X("diffDelete", s:background, s:red, "") - call X("diffChange", "", "2B5B77", "") - call X("diffText", s:line, s:blue, "") - - " ShowMarks Highlighting - call X("ShowMarksHLl", s:orange, s:background, "none") - call X("ShowMarksHLo", s:purple, s:background, "none") - call X("ShowMarksHLu", s:yellow, s:background, "none") - call X("ShowMarksHLm", s:aqua, s:background, "none") - - " Lua Highlighting - call X("luaStatement", s:purple, "", "") - call X("luaRepeat", s:purple, "", "") - call X("luaCondStart", s:purple, "", "") - call X("luaCondElseif", s:purple, "", "") - call X("luaCond", s:purple, "", "") - call X("luaCondEnd", s:purple, "", "") - - " Cucumber Highlighting - call X("cucumberGiven", s:blue, "", "") - call X("cucumberGivenAnd", s:blue, "", "") - - " Go Highlighting - call X("goDirective", s:purple, "", "") - call X("goDeclaration", s:purple, "", "") - call X("goStatement", s:purple, "", "") - call X("goConditional", s:purple, "", "") - call X("goConstants", s:orange, "", "") - call X("goTodo", s:yellow, "", "") - call X("goDeclType", s:blue, "", "") - call X("goBuiltins", s:purple, "", "") - call X("goRepeat", s:purple, "", "") - call X("goLabel", s:purple, "", "") - - " Clojure Highlighting - call X("clojureConstant", s:orange, "", "") - call X("clojureBoolean", s:orange, "", "") - call X("clojureCharacter", s:orange, "", "") - call X("clojureKeyword", s:green, "", "") - call X("clojureNumber", s:orange, "", "") - call X("clojureString", s:green, "", "") - call X("clojureRegexp", s:green, "", "") - call X("clojureParen", s:aqua, "", "") - call X("clojureVariable", s:yellow, "", "") - call X("clojureCond", s:blue, "", "") - call X("clojureDefine", s:purple, "", "") - call X("clojureException", s:red, "", "") - call X("clojureFunc", s:blue, "", "") - call X("clojureMacro", s:blue, "", "") - call X("clojureRepeat", s:blue, "", "") - call X("clojureSpecial", s:purple, "", "") - call X("clojureQuote", s:blue, "", "") - call X("clojureUnquote", s:blue, "", "") - call X("clojureMeta", s:blue, "", "") - call X("clojureDeref", s:blue, "", "") - call X("clojureAnonArg", s:blue, "", "") - call X("clojureRepeat", s:blue, "", "") - call X("clojureDispatch", s:blue, "", "") - - " Scala Highlighting - call X("scalaKeyword", s:purple, "", "") - call X("scalaKeywordModifier", s:purple, "", "") - call X("scalaOperator", s:blue, "", "") - call X("scalaPackage", s:red, "", "") - call X("scalaFqn", s:foreground, "", "") - call X("scalaFqnSet", s:foreground, "", "") - call X("scalaImport", s:purple, "", "") - call X("scalaBoolean", s:orange, "", "") - call X("scalaDef", s:purple, "", "") - call X("scalaVal", s:purple, "", "") - call X("scalaVar", s:aqua, "", "") - call X("scalaClass", s:purple, "", "") - call X("scalaObject", s:purple, "", "") - call X("scalaTrait", s:purple, "", "") - call X("scalaDefName", s:blue, "", "") - call X("scalaValName", s:foreground, "", "") - call X("scalaVarName", s:foreground, "", "") - call X("scalaClassName", s:foreground, "", "") - call X("scalaType", s:yellow, "", "") - call X("scalaTypeSpecializer", s:yellow, "", "") - call X("scalaAnnotation", s:orange, "", "") - call X("scalaNumber", s:orange, "", "") - call X("scalaDefSpecializer", s:yellow, "", "") - call X("scalaClassSpecializer", s:yellow, "", "") - call X("scalaBackTick", s:green, "", "") - call X("scalaRoot", s:foreground, "", "") - call X("scalaMethodCall", s:blue, "", "") - call X("scalaCaseType", s:yellow, "", "") - call X("scalaLineComment", s:comment, "", "") - call X("scalaComment", s:comment, "", "") - call X("scalaDocComment", s:comment, "", "") - call X("scalaDocTags", s:comment, "", "") - call X("scalaEmptyString", s:green, "", "") - call X("scalaMultiLineString", s:green, "", "") - call X("scalaUnicode", s:orange, "", "") - call X("scalaString", s:green, "", "") - call X("scalaStringEscape", s:green, "", "") - call X("scalaSymbol", s:orange, "", "") - call X("scalaChar", s:orange, "", "") - call X("scalaXml", s:green, "", "") - call X("scalaConstructorSpecializer", s:yellow, "", "") - call X("scalaBackTick", s:blue, "", "") - - " Git - call X("diffAdded", s:green, "", "") - call X("diffRemoved", s:red, "", "") - call X("gitcommitSummary", "", "", "bold") - - " Delete Functions - delf X - delf rgb - delf colour - delf rgb_colour - delf rgb_level - delf rgb_number - delf grey_colour - delf grey_level - delf grey_number -endif +" Delete Functions +delf X set background=dark