# HG changeset patch # User Bram Moolenaar # Date 1660926606 -7200 # Node ID 90a966f5c77a427da904d5a24cbe94c287f4f47e # Parent b7d232b59d5efd86432bf74b6c62fb43504344dd Update runtime files Commit: https://github.com/vim/vim/commit/e80086446cc20856ed8359bc8dc87c4d430da4c8 Author: Bram Moolenaar Date: Fri Aug 19 17:15:35 2022 +0100 Update runtime files diff --git a/runtime/autoload/python.vim b/runtime/autoload/python.vim --- a/runtime/autoload/python.vim +++ b/runtime/autoload/python.vim @@ -15,8 +15,9 @@ let s:maxoff = 50 " maximum number function s:SearchBracket(fromlnum, flags) return searchpairpos('[[({]', '', '[])}]', a:flags, - \ {-> synID('.', col('.'), v:true)->synIDattr('name') - \ =~ '\%(Comment\|Todo\|String\)$'}, + \ {-> synstack('.', col('.')) + \ ->map({_, id -> id->synIDattr('name')}) + \ ->match('\%(Comment\|Todo\|String\)$') >= 0}, \ [0, a:fromlnum - s:maxoff]->max(), s:searchpair_timeout) endfunction @@ -143,12 +144,16 @@ function python#GetIndent(lnum, ...) " If the last character in the line is a comment, do a binary search for " the start of the comment. synID() is slow, a linear search would take " too long on a long line. - if synIDattr(synID(plnum, pline_len, 1), "name") =~ "\\(Comment\\|Todo\\)" + if synstack(plnum, pline_len) + \ ->map({_, id -> id->synIDattr('name')}) + \ ->match('\%(Comment\|Todo\)$') >= 0 let min = 1 let max = pline_len while min < max let col = (min + max) / 2 - if synIDattr(synID(plnum, col, 1), "name") =~ "\\(Comment\\|Todo\\)" + if synstack(plnum, col) + \ ->map({_, id -> id->synIDattr('name')}) + \ ->match('\%(Comment\|Todo\)$') >= 0 let max = col else let min = col + 1 diff --git a/runtime/colors/blue.vim b/runtime/colors/blue.vim --- a/runtime/colors/blue.vim +++ b/runtime/colors/blue.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Steven Vertigan " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:49:58 +" Last Updated: Fri Aug 5 12:25:12 2022 " Generated by Colortemplate v2.2.0 @@ -13,12 +13,12 @@ set background=dark hi clear let g:colors_name = 'blue' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#000000', '#870000', '#006400', '#878700', '#000087', '#870087', '#008787', '#bcbcbc', '#878787', '#d70000', '#00ff00', '#ffdf00', '#5fafff', '#d787d7', '#5fffff', '#ffffff'] + let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff'] endif -hi Normal guifg=#ffdf00 guibg=#000087 gui=NONE cterm=NONE +hi Normal guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE hi CursorLine guifg=NONE guibg=#005faf gui=NONE cterm=NONE hi Pmenu guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE hi PmenuSel guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE @@ -27,9 +27,9 @@ hi ColorColumn guifg=NONE guibg=#870087 hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE hi CursorColumn guifg=NONE guibg=#005faf gui=NONE cterm=NONE -hi CursorIM guifg=#000000 guibg=#ffdf00 gui=NONE cterm=NONE -hi CursorLineNr guifg=#ffdf00 guibg=#005faf gui=bold cterm=NONE -hi EndOfBuffer guifg=#ffdf00 guibg=#000087 gui=NONE cterm=NONE +hi CursorIM guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE +hi CursorLineNr guifg=#ffd700 guibg=#005faf gui=bold cterm=NONE +hi EndOfBuffer guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE hi Error guifg=#ff7f50 guibg=#000087 gui=reverse cterm=reverse hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE hi FoldColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE @@ -43,7 +43,7 @@ hi NonText guifg=#d787d7 guibg=NONE gui= hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE hi Question guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE -hi Search guifg=#ffdf00 guibg=#000000 gui=reverse cterm=reverse +hi Search guifg=#ffd700 guibg=#000000 gui=reverse cterm=reverse hi SignColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE hi SpecialKey guifg=#5fffff guibg=NONE gui=NONE cterm=NONE hi SpellBad guifg=#d70000 guibg=NONE guisp=#d70000 gui=undercurl cterm=underline @@ -58,7 +58,7 @@ hi VertSplit guifg=#008787 guibg=NONE gu hi Visual guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE hi VisualNOS guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE hi WarningMsg guifg=#d70000 guibg=NONE gui=NONE cterm=NONE -hi WildMenu guifg=#000087 guibg=#ffdf00 gui=NONE cterm=NONE +hi WildMenu guifg=#000087 guibg=#ffd700 gui=NONE cterm=NONE hi debugBreakpoint guifg=#00ff00 guibg=#000087 gui=reverse cterm=reverse hi debugPC guifg=#5fffff guibg=#000087 gui=reverse cterm=reverse hi Directory guifg=#5fffff guibg=NONE gui=NONE cterm=NONE @@ -73,7 +73,7 @@ hi Statement guifg=#ffffff guibg=NONE gu hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse hi Type guifg=#ffa500 guibg=NONE gui=bold cterm=NONE hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline -hi Label guifg=#ffdf00 guibg=NONE gui=NONE cterm=NONE +hi Label guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE hi! link Terminal Normal hi! link Debug Special hi! link diffAdded String @@ -526,6 +526,22 @@ if s:t_Co >= 0 endif " Background: dark +" Color: x_black #000000 16 black +" Color: x_darkred #cd0000 160 darkred +" Color: x_darkgreen #00cd00 40 darkgreen +" Color: x_darkyellow #cdcd00 184 darkyellow +" Color: x_darkblue #0000ee 21 darkblue +" Color: x_darkmagenta #cd00cd 164 darkmagenta +" Color: x_darkcyan #00cdcd 44 darkcyan +" Color: x_gray #e5e5e5 254 gray +" Color: x_darkgray #7f7f7f 244 darkgray +" Color: x_red #ff0000 196 red +" Color: x_green #00ff00 46 green +" Color: x_yellow #ffff00 226 yellow +" Color: x_blue #5c5cff 63 blue +" Color: x_magenta #ff00ff 201 magenta +" Color: x_cyan #00ffff 51 cyan +" Color: x_white #ffffff 231 white " Color: black #000000 16 black " Color: darkred #870000 88 darkred " Color: darkyellow #878700 100 darkyellow @@ -537,7 +553,7 @@ endif " Color: darkgray #878787 102 darkgray " Color: red #d70000 160 red " Color: green #00ff00 46 green -" Color: yellow #ffdf00 220 yellow +" Color: yellow #ffd700 220 yellow " Color: blue #005faf 25 blue " Color: magenta #d787d7 176 magenta " Color: cyan #5fffff 87 cyan @@ -549,8 +565,8 @@ endif " Color: coral #ff7f50 209 red " Color: olivedrab #6b8e23 64 green " Color: slateblue #6a5acd 62 darkmagenta -" Term colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan gray -" Term colors: darkgray red green yellow xtermblue magenta cyan white +" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray +" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white " Color: bgDiffA #5F875F 65 darkgreen " Color: bgDiffC #5F87AF 67 blue " Color: bgDiffD #AF5FAF 133 magenta diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim --- a/runtime/colors/darkblue.vim +++ b/runtime/colors/darkblue.vim @@ -4,7 +4,7 @@ " Maintainer: Original author Bohdan Vlasyuk " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:49:59 +" Last Updated: Mon Aug 8 15:21:06 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'darkblue' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#000000', '#8b0000', '#90f020', '#ffa500', '#00008b', '#8b008b', '#008b8b', '#c0c0c0', '#808080', '#ffa0a0', '#90f020', '#ffff60', '#0030ff', '#ff00ff', '#90fff0', '#ffffff'] diff --git a/runtime/colors/delek.vim b/runtime/colors/delek.vim --- a/runtime/colors/delek.vim +++ b/runtime/colors/delek.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer David Schweikert " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:00 +" Last Updated: Mon Aug 8 15:21:07 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=light hi clear let g:colors_name = 'delek' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#ffffff', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#bcbcbc', '#ee0000', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#000000'] diff --git a/runtime/colors/desert.vim b/runtime/colors/desert.vim --- a/runtime/colors/desert.vim +++ b/runtime/colors/desert.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Hans Fugal " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:01 +" Last Updated: Mon Aug 8 15:21:08 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'desert' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#7f7f8c', '#cd5c5c', '#9acd32', '#bdb76b', '#75a0ff', '#eeee00', '#cd853f', '#666666', '#8a7f7f', '#ff0000', '#89fb98', '#f0e68c', '#6dceeb', '#ffde9b', '#ffa0a0', '#c2bfa5'] diff --git a/runtime/colors/elflord.vim b/runtime/colors/elflord.vim --- a/runtime/colors/elflord.vim +++ b/runtime/colors/elflord.vim @@ -3,7 +3,7 @@ " Maintainer: original maintainer Ron Aaron " Website: https://www.github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:02 +" Last Updated: Mon Aug 8 15:21:08 2022 " Generated by Colortemplate v2.2.0 @@ -12,7 +12,7 @@ set background=dark hi clear let g:colors_name = 'elflord' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 hi! link Terminal Normal hi! link Boolean Constant diff --git a/runtime/colors/evening.vim b/runtime/colors/evening.vim --- a/runtime/colors/evening.vim +++ b/runtime/colors/evening.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Steven Vertigan " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:03 +" Last Updated: Mon Aug 8 15:21:09 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'evening' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#000000', '#ffa500', '#2e8b57', '#ffff00', '#006faf', '#8b008b', '#008b8b', '#bebebe', '#4d4d4d', '#ff5f5f', '#00ff00', '#ffff60', '#0087ff', '#ff80ff', '#00ffff', '#ffffff'] diff --git a/runtime/colors/habamax.vim b/runtime/colors/habamax.vim --- a/runtime/colors/habamax.vim +++ b/runtime/colors/habamax.vim @@ -4,7 +4,7 @@ " Maintainer: Maxim Kim " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:04 +" Last Updated: Mon Aug 8 15:21:10 2022 " Generated by Colortemplate v2.2.0 @@ -13,10 +13,10 @@ set background=dark hi clear let g:colors_name = 'habamax' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#df875f', '#afd7af', '#dfdf87', '#87afd7', '#dfafdf', '#87afaf', '#bcbcbc'] + let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d7875f', '#afd7af', '#d7d787', '#87afd7', '#d7afd7', '#87afaf', '#bcbcbc'] endif hi! link Terminal Normal hi! link StatuslineTerm Statusline @@ -58,14 +58,14 @@ hi! link elixirInclude Statement hi! link elixirAtom PreProc hi! link elixirDocTest String hi ALEErrorSign guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE -hi ALEInfoSign guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE +hi ALEInfoSign guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE hi ALEWarningSign guifg=#af87af guibg=NONE gui=NONE cterm=NONE hi ALEError guifg=#1c1c1c guibg=#d75f5f gui=NONE cterm=NONE hi ALEVirtualTextError guifg=#1c1c1c guibg=#d75f5f gui=NONE cterm=NONE hi ALEWarning guifg=#1c1c1c guibg=#af87af gui=NONE cterm=NONE hi ALEVirtualTextWarning guifg=#1c1c1c guibg=#af87af gui=NONE cterm=NONE -hi ALEInfo guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE -hi ALEVirtualTextInfo guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE +hi ALEInfo guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE +hi ALEVirtualTextInfo guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE hi Normal guifg=#bcbcbc guibg=#1c1c1c gui=NONE cterm=NONE hi Statusline guifg=#1c1c1c guibg=#9e9e9e gui=NONE cterm=NONE hi StatuslineNC guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE @@ -93,18 +93,18 @@ hi PmenuSel guifg=#1c1c1c guibg=#afaf87 hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi Error guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse hi ErrorMsg guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse -hi ModeMsg guifg=#1c1c1c guibg=#dfdf87 gui=NONE cterm=NONE +hi ModeMsg guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE hi MoreMsg guifg=#87af87 guibg=NONE gui=NONE cterm=NONE hi Question guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE -hi WarningMsg guifg=#df875f guibg=NONE gui=NONE cterm=NONE -hi Todo guifg=#dfdf87 guibg=#1c1c1c gui=reverse cterm=reverse +hi WarningMsg guifg=#d7875f guibg=NONE gui=NONE cterm=NONE +hi Todo guifg=#d7d787 guibg=#1c1c1c gui=reverse cterm=reverse hi MatchParen guifg=#5f8787 guibg=#1c1c1c gui=reverse cterm=reverse hi Search guifg=#1c1c1c guibg=#87af87 gui=NONE cterm=NONE hi IncSearch guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE hi CurSearch guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE -hi WildMenu guifg=#1c1c1c guibg=#dfdf87 gui=NONE cterm=NONE +hi WildMenu guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE hi debugPC guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE -hi debugBreakpoint guifg=#1c1c1c guibg=#df875f gui=NONE cterm=NONE +hi debugBreakpoint guifg=#1c1c1c guibg=#d7875f gui=NONE cterm=NONE hi Cursor guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE hi lCursor guifg=#1c1c1c guibg=#5fff00 gui=NONE cterm=NONE hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE @@ -114,9 +114,9 @@ hi ColorColumn guifg=NONE guibg=#262626 hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline hi SpellCap guifg=NONE guibg=NONE guisp=#5f87af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline hi SpellLocal guifg=NONE guibg=NONE guisp=#87af87 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline -hi SpellRare guifg=NONE guibg=NONE guisp=#dfafdf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline +hi SpellRare guifg=NONE guibg=NONE guisp=#d7afd7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE -hi Constant guifg=#df875f guibg=NONE gui=NONE cterm=NONE +hi Constant guifg=#d7875f guibg=NONE gui=NONE cterm=NONE hi String guifg=#87af87 guibg=NONE gui=NONE cterm=NONE hi Character guifg=#afd7af guibg=NONE gui=NONE cterm=NONE hi Identifier guifg=#87afaf guibg=NONE gui=NONE cterm=NONE @@ -125,7 +125,7 @@ hi PreProc guifg=#afaf87 guibg=NONE gui= hi Type guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE hi Special guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline -hi Title guifg=#dfdf87 guibg=NONE gui=bold cterm=bold +hi Title guifg=#d7d787 guibg=NONE gui=bold cterm=bold hi Directory guifg=#87afaf guibg=NONE gui=bold cterm=bold hi Conceal guifg=#767676 guibg=NONE gui=NONE cterm=NONE hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE @@ -135,7 +135,7 @@ hi DiffDelete guifg=#af875f guibg=NONE g hi diffAdded guifg=#87af87 guibg=NONE gui=NONE cterm=NONE hi diffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE hi diffSubname guifg=#af87af guibg=NONE gui=NONE cterm=NONE -hi DiffText guifg=#000000 guibg=#dfdfdf gui=NONE cterm=NONE +hi DiffText guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE hi DiffChange guifg=#000000 guibg=#afafaf gui=NONE cterm=NONE if s:t_Co >= 256 @@ -254,7 +254,7 @@ if s:t_Co >= 256 hi diffAdded ctermfg=108 ctermbg=NONE cterm=NONE hi diffRemoved ctermfg=167 ctermbg=NONE cterm=NONE hi diffSubname ctermfg=139 ctermbg=NONE cterm=NONE - hi DiffText ctermfg=16 ctermbg=254 cterm=NONE + hi DiffText ctermfg=16 ctermbg=188 cterm=NONE hi DiffChange ctermfg=16 ctermbg=145 cterm=NONE unlet s:t_Co finish @@ -489,15 +489,15 @@ endif " Color: color00 #1C1C1C 234 black " Color: color08 #767676 243 darkgray " Color: color01 #D75F5F 167 darkred -" Color: color09 #DF875F 173 red +" Color: color09 #D7875F 173 red " Color: color02 #87AF87 108 darkgreen " Color: color10 #AFD7AF 151 green " Color: color03 #AFAF87 144 darkyellow -" Color: color11 #DFDF87 186 yellow +" Color: color11 #D7D787 186 yellow " Color: color04 #5F87AF 67 blue " Color: color12 #87AFD7 110 blue " Color: color05 #AF87AF 139 darkmagenta -" Color: color13 #DFAFDF 182 magenta +" Color: color13 #D7AFD7 182 magenta " Color: color06 #5F8787 66 darkcyan " Color: color14 #87AFAF 109 cyan " Color: color07 #9E9E9E 247 gray @@ -506,12 +506,12 @@ endif " Color: colorB #262626 235 darkgrey " Color: colorNonT #585858 240 darkgrey " Color: colorC #FFAF5F 215 red -" Color: colorlC #5FFF00 ~ +" Color: colorlC #5FFF00 82 green " Color: colorV #1F3F5F 109 cyan " Color: diffAdd #87AF87 108 darkgreen " Color: diffDelete #af875f 137 darkyellow " Color: diffChange #AFAFAF 145 darkgray -" Color: diffText #DFDFDF 254 lightgrey +" Color: diffText #D7D7D7 188 lightgrey " Color: black #000000 16 black " Color: white #FFFFFF 231 white " Term colors: color00 color01 color02 color03 color04 color05 color06 color07 diff --git a/runtime/colors/industry.vim b/runtime/colors/industry.vim --- a/runtime/colors/industry.vim +++ b/runtime/colors/industry.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Shian Lee. " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:05 +" Last Updated: Mon Aug 8 15:21:11 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'industry' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#303030', '#870000', '#5fd75f', '#afaf00', '#87afff', '#af00af', '#00afaf', '#6c6c6c', '#444444', '#ff0000', '#00ff00', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff'] diff --git a/runtime/colors/koehler.vim b/runtime/colors/koehler.vim --- a/runtime/colors/koehler.vim +++ b/runtime/colors/koehler.vim @@ -3,7 +3,7 @@ " Maintainer: original maintainer Ron Aaron " Website: https://www.github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:06 +" Last Updated: Mon Aug 8 15:21:12 2022 " Generated by Colortemplate v2.2.0 @@ -12,7 +12,7 @@ set background=dark hi clear let g:colors_name = 'koehler' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 hi! link Terminal Normal hi! link Boolean Constant diff --git a/runtime/colors/lunaperche.vim b/runtime/colors/lunaperche.vim new file mode 100644 --- /dev/null +++ b/runtime/colors/lunaperche.vim @@ -0,0 +1,911 @@ +" Name: Perchè il sole a Milano? Portofino? Dimmi la luna perchè? +" Description: White(perchè il sole)/Black(la luna perchè?) background colorscheme. +" Author: Maxim Kim +" Maintainer: Maxim Kim +" Website: https://www.github.com/vim/colorschemes +" License: Vim License (see `:help license`) +" Last Updated: Thu Aug 18 14:36:32 2022 + +" Generated by Colortemplate v2.2.0 + +hi clear +let g:colors_name = 'lunaperche' + +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 + +hi! link helpVim Title +hi! link helpHeader Title +hi! link helpHyperTextJump Underlined +hi! link fugitiveSymbolicRef PreProc +hi! link fugitiveHeading Statement +hi! link fugitiveStagedHeading Statement +hi! link fugitiveUnstagedHeading Statement +hi! link fugitiveUntrackedHeading Statement +hi! link fugitiveStagedModifier PreProc +hi! link fugitiveUnstagedModifier PreProc +hi! link fugitiveHash Constant +hi! link diffFile PreProc +hi! link markdownHeadingDelimiter Special +hi! link rstSectionDelimiter PreProc +hi! link rstDirective Special +hi! link rstHyperlinkReference Special +hi! link rstFieldName Special +hi! link rstDelimiter Special +hi! link rstInterpretedText Special +hi! link colortemplateKey Statement +hi! link xmlTagName Statement +hi! link javaScriptFunction Statement +hi! link javaScriptIdentifier Statement +hi! link sqlKeyword Statement +hi! link yamlBlockMappingKey Statement +hi! link rubyMacro Statement +hi! link rubyDefine Statement +hi! link vimGroup Normal +hi! link vimVar Normal +hi! link vimOper Normal +hi! link vimSep Normal +hi! link vimParenSep Normal +hi! link vimOption Normal +hi! link vimCommentString Comment +hi! link pythonInclude Statement +hi! link elixirOperator Statement +hi! link elixirKeyword Statement +hi! link elixirBlockDefinition Statement +hi! link elixirDefine Statement +hi! link elixirPrivateDefine Statement +hi! link elixirGuard Statement +hi! link elixirPrivateGuard Statement +hi! link elixirModuleDefine Statement +hi! link elixirProtocolDefine Statement +hi! link elixirImplDefine Statement +hi! link elixirRecordDefine Statement +hi! link elixirPrivateRecordDefine Statement +hi! link elixirMacroDefine Statement +hi! link elixirPrivateMacroDefine Statement +hi! link elixirDelegateDefine Statement +hi! link elixirOverridableDefine Statement +hi! link elixirExceptionDefine Statement +hi! link elixirCallbackDefine Statement +hi! link elixirStructDefine Statement +hi! link elixirExUnitMacro Statement +hi! link elixirInclude Statement +hi! link elixirVariable Special +hi! link elixirAtom Constant +hi! link elixirDocTest String +hi! link shQuote Constant +hi! link shNoQuote Normal +hi! link shTestOpr Normal +hi! link shOperator Normal +hi! link shSetOption Normal +hi! link shOption Normal +hi! link shCommandSub Normal +hi! link shDerefPattern shQuote +hi! link shDerefOp Special +hi! link Terminal Normal +hi! link StatuslineTerm Statusline +hi! link StatuslineTermNC StatuslineNC +hi! link LineNrAbove LineNr +hi! link LineNrBelow LineNr +if &background ==# 'dark' + if (has('termguicolors') && &termguicolors) || has('gui_running') + let g:terminal_ansi_colors = ['#000000', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#d787af', '#5fafaf', '#c6c6c6', '#767676', '#ff5f5f', '#5fd75f', '#ffd787', '#87afd7', '#ffafd7', '#5fd7d7', '#ffffff'] + endif + hi Normal guifg=#c6c6c6 guibg=#000000 gui=NONE cterm=NONE + hi Statusline guifg=#000000 guibg=#c6c6c6 gui=bold cterm=bold + hi StatuslineNC guifg=#000000 guibg=#767676 gui=NONE cterm=NONE + hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE + hi TabLine guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE + hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE + hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold + hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE + hi QuickFixLine guifg=#000000 guibg=#87afd7 gui=NONE cterm=NONE + hi CursorLineNr guifg=#ffffff guibg=NONE gui=bold cterm=bold + hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE + hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE + hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE + hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE + hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE + hi Pmenu guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE + hi PmenuSel guifg=NONE guibg=#005f00 gui=NONE cterm=NONE + hi PmenuThumb guifg=NONE guibg=#c6c6c6 gui=NONE cterm=NONE + hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE + hi ErrorMsg guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE + hi ModeMsg guifg=#ffd787 guibg=NONE gui=reverse cterm=reverse + hi MoreMsg guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE + hi Question guifg=#ffafd7 guibg=NONE gui=NONE cterm=NONE + hi WarningMsg guifg=#ff5f5f guibg=NONE gui=NONE cterm=NONE + hi Todo guifg=#5fd7d7 guibg=#000000 gui=reverse cterm=reverse + hi Search guifg=#000000 guibg=#ffd787 gui=NONE cterm=NONE + hi IncSearch guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE + hi CurSearch guifg=#000000 guibg=#5fd75f gui=NONE cterm=NONE + hi WildMenu guifg=#000000 guibg=#ffd787 gui=bold cterm=bold + hi debugPC guifg=#5f87af guibg=NONE gui=reverse cterm=reverse + hi debugBreakpoint guifg=#5fafaf guibg=NONE gui=reverse cterm=reverse + hi Cursor guifg=#ffffff guibg=#000000 gui=reverse cterm=reverse + hi lCursor guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse + hi Visual guifg=#ffffff guibg=#005f87 gui=NONE cterm=NONE + hi MatchParen guifg=#c5e7c5 guibg=#000000 gui=reverse cterm=reverse + hi VisualNOS guifg=#000000 guibg=#5fafaf gui=NONE cterm=NONE + hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE + hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE + hi Folded guifg=#767676 guibg=#1c1c1c gui=NONE cterm=NONE + hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE + hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE + hi SpellCap guifg=NONE guibg=NONE guisp=#5fafaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE + hi SpellLocal guifg=NONE guibg=NONE guisp=#5faf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE + hi SpellRare guifg=NONE guibg=NONE guisp=#ffafd7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE + hi Comment guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE + hi Constant guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE + hi Identifier guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement guifg=#eeeeee guibg=NONE gui=bold cterm=bold + hi Type guifg=#5fd75f guibg=NONE gui=bold cterm=bold + hi PreProc guifg=#af875f guibg=NONE gui=NONE cterm=NONE + hi Special guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE + hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline + hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold + hi Directory guifg=#5fd7d7 guibg=NONE gui=bold cterm=bold + hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi DiffAdd guifg=#000000 guibg=#af87af gui=NONE cterm=NONE + hi DiffChange guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE + hi DiffText guifg=#000000 guibg=#5fd7d7 gui=NONE cterm=NONE + hi DiffDelete guifg=#d78787 guibg=NONE gui=NONE cterm=NONE + hi diffAdded guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE + hi diffRemoved guifg=#d78787 guibg=NONE gui=NONE cterm=NONE + hi diffSubname guifg=#ffafd7 guibg=NONE gui=NONE cterm=NONE + hi dirType guifg=#d787af guibg=NONE gui=NONE cterm=NONE + hi dirPermissionUser guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE + hi dirPermissionGroup guifg=#af875f guibg=NONE gui=NONE cterm=NONE + hi dirPermissionOther guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE + hi dirOwner guifg=#767676 guibg=NONE gui=NONE cterm=NONE + hi dirGroup guifg=#767676 guibg=NONE gui=NONE cterm=NONE + hi dirTime guifg=#767676 guibg=NONE gui=NONE cterm=NONE + hi dirSize guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE + hi dirSizeMod guifg=#d787af guibg=NONE gui=NONE cterm=NONE + hi FilterMenuDirectorySubtle guifg=#878787 guibg=NONE gui=NONE cterm=NONE + hi dirFilterMenuBookmarkPath guifg=#878787 guibg=NONE gui=NONE cterm=NONE + hi dirFilterMenuHistoryPath guifg=#878787 guibg=NONE gui=NONE cterm=NONE + hi FilterMenuLineNr guifg=#878787 guibg=NONE gui=NONE cterm=NONE + hi CocMenuSel guifg=NONE guibg=#005f00 gui=NONE cterm=NONE + hi CocSearch guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE +else + " Light background + if (has('termguicolors') && &termguicolors) || has('gui_running') + let g:terminal_ansi_colors = ['#000000', '#870000', '#008700', '#875f00', '#005faf', '#870087', '#005f5f', '#808080', '#767676', '#d70000', '#87d787', '#d7d787', '#0087d7', '#af00af', '#00afaf', '#ffffff'] + endif + hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE + hi Statusline guifg=#ffffff guibg=#000000 gui=bold cterm=bold + hi StatuslineNC guifg=#ffffff guibg=#767676 gui=NONE cterm=NONE + hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE + hi TabLine guifg=#000000 guibg=#bcbcbc gui=NONE cterm=NONE + hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE + hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold,reverse cterm=bold,reverse + hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE + hi QuickFixLine guifg=#ffffff guibg=#0087d7 gui=NONE cterm=NONE + hi CursorLineNr guifg=#000000 guibg=NONE gui=bold cterm=bold + hi LineNr guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE + hi NonText guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE + hi FoldColumn guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE + hi EndOfBuffer guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE + hi SpecialKey guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE + hi Pmenu guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE + hi PmenuSel guifg=NONE guibg=#afd7af gui=NONE cterm=NONE + hi PmenuThumb guifg=NONE guibg=#767676 gui=NONE cterm=NONE + hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE + hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE + hi ModeMsg guifg=#d7d787 guibg=#000000 gui=reverse cterm=reverse + hi MoreMsg guifg=#008700 guibg=NONE gui=bold cterm=bold + hi Question guifg=#870087 guibg=NONE gui=bold cterm=bold + hi WarningMsg guifg=#d70000 guibg=NONE gui=bold cterm=bold + hi Todo guifg=#005f5f guibg=#ffffff gui=reverse cterm=reverse + hi Search guifg=#000000 guibg=#d7d787 gui=NONE cterm=NONE + hi IncSearch guifg=#000000 guibg=#87d787 gui=NONE cterm=NONE + hi CurSearch guifg=#000000 guibg=#87d787 gui=NONE cterm=NONE + hi WildMenu guifg=#000000 guibg=#d7d787 gui=bold cterm=bold + hi debugPC guifg=#005faf guibg=NONE gui=reverse cterm=reverse + hi debugBreakpoint guifg=#005f5f guibg=NONE gui=reverse cterm=reverse + hi Cursor guifg=#000000 guibg=#ffffff gui=reverse cterm=reverse + hi lCursor guifg=#ff00ff guibg=#000000 gui=reverse cterm=reverse + hi Visual guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE + hi MatchParen guifg=NONE guibg=#c5e7c5 gui=NONE cterm=NONE + hi VisualNOS guifg=#ffffff guibg=#00afaf gui=NONE cterm=NONE + hi CursorLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE + hi CursorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE + hi Folded guifg=#767676 guibg=#eeeeee gui=NONE cterm=NONE + hi ColorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE + hi SpellBad guifg=NONE guibg=NONE guisp=#870000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE + hi SpellCap guifg=NONE guibg=NONE guisp=#005f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE + hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE + hi SpellRare guifg=NONE guibg=NONE guisp=#af00af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE + hi Comment guifg=#005faf guibg=NONE gui=NONE cterm=NONE + hi Constant guifg=#870000 guibg=NONE gui=NONE cterm=NONE + hi Identifier guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement guifg=#000000 guibg=NONE gui=bold cterm=bold + hi Type guifg=#008700 guibg=NONE gui=bold cterm=bold + hi PreProc guifg=#875f00 guibg=NONE gui=NONE cterm=NONE + hi Special guifg=#005f5f guibg=NONE gui=NONE cterm=NONE + hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline + hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold + hi Directory guifg=#005faf guibg=NONE gui=bold cterm=bold + hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE + hi DiffAdd guifg=#000000 guibg=#d7afd7 gui=NONE cterm=NONE + hi DiffChange guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE + hi DiffText guifg=#000000 guibg=#5fd7d7 gui=NONE cterm=NONE + hi DiffDelete guifg=#870000 guibg=NONE gui=NONE cterm=NONE + hi diffAdded guifg=#008700 guibg=NONE gui=NONE cterm=NONE + hi diffRemoved guifg=#d70000 guibg=NONE gui=NONE cterm=NONE + hi diffSubname guifg=#870087 guibg=NONE gui=NONE cterm=NONE + hi dirType guifg=#005f5f guibg=NONE gui=NONE cterm=NONE + hi dirPermissionUser guifg=#875f00 guibg=NONE gui=NONE cterm=NONE + hi dirPermissionGroup guifg=#008700 guibg=NONE gui=NONE cterm=NONE + hi dirPermissionOther guifg=#870087 guibg=NONE gui=NONE cterm=NONE + hi dirOwner guifg=#808080 guibg=NONE gui=NONE cterm=NONE + hi dirGroup guifg=#808080 guibg=NONE gui=NONE cterm=NONE + hi dirTime guifg=#808080 guibg=NONE gui=NONE cterm=NONE + hi dirSize guifg=#870000 guibg=NONE gui=NONE cterm=NONE + hi dirSizeMod guifg=#005f5f guibg=NONE gui=NONE cterm=NONE + hi dirLink guifg=#008700 guibg=NONE gui=bold cterm=bold + hi dirFilterMenuBookmarkPath guifg=#626262 guibg=NONE gui=NONE cterm=NONE + hi dirFilterMenuHistoryPath guifg=#626262 guibg=NONE gui=NONE cterm=NONE + hi FilterMenuDirectorySubtle guifg=#626262 guibg=NONE gui=NONE cterm=NONE + hi FilterMenuLineNr guifg=#626262 guibg=NONE gui=NONE cterm=NONE + hi CocMenuSel guifg=NONE guibg=#afd7af gui=NONE cterm=NONE + hi CocSearch guifg=#870000 guibg=NONE gui=NONE cterm=NONE +endif + +if s:t_Co >= 256 + hi! link helpVim Title + hi! link helpHeader Title + hi! link helpHyperTextJump Underlined + hi! link fugitiveSymbolicRef PreProc + hi! link fugitiveHeading Statement + hi! link fugitiveStagedHeading Statement + hi! link fugitiveUnstagedHeading Statement + hi! link fugitiveUntrackedHeading Statement + hi! link fugitiveStagedModifier PreProc + hi! link fugitiveUnstagedModifier PreProc + hi! link fugitiveHash Constant + hi! link diffFile PreProc + hi! link markdownHeadingDelimiter Special + hi! link rstSectionDelimiter PreProc + hi! link rstDirective Special + hi! link rstHyperlinkReference Special + hi! link rstFieldName Special + hi! link rstDelimiter Special + hi! link rstInterpretedText Special + hi! link colortemplateKey Statement + hi! link xmlTagName Statement + hi! link javaScriptFunction Statement + hi! link javaScriptIdentifier Statement + hi! link sqlKeyword Statement + hi! link yamlBlockMappingKey Statement + hi! link rubyMacro Statement + hi! link rubyDefine Statement + hi! link vimGroup Normal + hi! link vimVar Normal + hi! link vimOper Normal + hi! link vimSep Normal + hi! link vimParenSep Normal + hi! link vimOption Normal + hi! link vimCommentString Comment + hi! link pythonInclude Statement + hi! link elixirOperator Statement + hi! link elixirKeyword Statement + hi! link elixirBlockDefinition Statement + hi! link elixirDefine Statement + hi! link elixirPrivateDefine Statement + hi! link elixirGuard Statement + hi! link elixirPrivateGuard Statement + hi! link elixirModuleDefine Statement + hi! link elixirProtocolDefine Statement + hi! link elixirImplDefine Statement + hi! link elixirRecordDefine Statement + hi! link elixirPrivateRecordDefine Statement + hi! link elixirMacroDefine Statement + hi! link elixirPrivateMacroDefine Statement + hi! link elixirDelegateDefine Statement + hi! link elixirOverridableDefine Statement + hi! link elixirExceptionDefine Statement + hi! link elixirCallbackDefine Statement + hi! link elixirStructDefine Statement + hi! link elixirExUnitMacro Statement + hi! link elixirInclude Statement + hi! link elixirVariable Special + hi! link elixirAtom Constant + hi! link elixirDocTest String + hi! link shQuote Constant + hi! link shNoQuote Normal + hi! link shTestOpr Normal + hi! link shOperator Normal + hi! link shSetOption Normal + hi! link shOption Normal + hi! link shCommandSub Normal + hi! link shDerefPattern shQuote + hi! link shDerefOp Special + hi! link Terminal Normal + hi! link StatuslineTerm Statusline + hi! link StatuslineTermNC StatuslineNC + hi! link LineNrAbove LineNr + hi! link LineNrBelow LineNr + if &background ==# 'dark' + hi Normal ctermfg=251 ctermbg=16 cterm=NONE + hi Statusline ctermfg=16 ctermbg=251 cterm=bold + hi StatuslineNC ctermfg=16 ctermbg=243 cterm=NONE + hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE + hi TabLine ctermfg=16 ctermbg=251 cterm=NONE + hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE + hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=16 ctermbg=231 cterm=NONE + hi QuickFixLine ctermfg=16 ctermbg=110 cterm=NONE + hi CursorLineNr ctermfg=231 ctermbg=NONE cterm=bold + hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE + hi NonText ctermfg=240 ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=234 cterm=NONE + hi PmenuSel ctermfg=NONE ctermbg=22 cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=251 cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=231 ctermbg=203 cterm=NONE + hi ErrorMsg ctermfg=231 ctermbg=203 cterm=NONE + hi ModeMsg ctermfg=222 ctermbg=NONE cterm=reverse + hi MoreMsg ctermfg=77 ctermbg=NONE cterm=NONE + hi Question ctermfg=218 ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=203 ctermbg=NONE cterm=NONE + hi Todo ctermfg=116 ctermbg=16 cterm=reverse + hi Search ctermfg=16 ctermbg=222 cterm=NONE + hi IncSearch ctermfg=16 ctermbg=77 cterm=NONE + hi CurSearch ctermfg=16 ctermbg=77 cterm=NONE + hi WildMenu ctermfg=16 ctermbg=222 cterm=bold + hi debugPC ctermfg=67 ctermbg=NONE cterm=reverse + hi debugBreakpoint ctermfg=73 ctermbg=NONE cterm=reverse + hi Visual ctermfg=231 ctermbg=24 cterm=NONE + hi MatchParen ctermfg=30 ctermbg=16 cterm=reverse + hi VisualNOS ctermfg=16 ctermbg=73 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=235 cterm=NONE + hi CursorColumn ctermfg=NONE ctermbg=235 cterm=NONE + hi Folded ctermfg=243 ctermbg=234 cterm=NONE + hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE + hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline + hi SpellCap ctermfg=73 ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline + hi SpellRare ctermfg=218 ctermbg=NONE cterm=underline + hi Comment ctermfg=110 ctermbg=NONE cterm=NONE + hi Constant ctermfg=222 ctermbg=NONE cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement ctermfg=255 ctermbg=NONE cterm=bold + hi Type ctermfg=77 ctermbg=NONE cterm=bold + hi PreProc ctermfg=137 ctermbg=NONE cterm=NONE + hi Special ctermfg=73 ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi Directory ctermfg=116 ctermbg=NONE cterm=bold + hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=16 ctermbg=139 cterm=NONE + hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE + hi DiffText ctermfg=16 ctermbg=80 cterm=NONE + hi DiffDelete ctermfg=174 ctermbg=NONE cterm=NONE + hi diffAdded ctermfg=77 ctermbg=NONE cterm=NONE + hi diffRemoved ctermfg=174 ctermbg=NONE cterm=NONE + hi diffSubname ctermfg=218 ctermbg=NONE cterm=NONE + hi dirType ctermfg=175 ctermbg=NONE cterm=NONE + hi dirPermissionUser ctermfg=71 ctermbg=NONE cterm=NONE + hi dirPermissionGroup ctermfg=137 ctermbg=NONE cterm=NONE + hi dirPermissionOther ctermfg=73 ctermbg=NONE cterm=NONE + hi dirOwner ctermfg=243 ctermbg=NONE cterm=NONE + hi dirGroup ctermfg=243 ctermbg=NONE cterm=NONE + hi dirTime ctermfg=243 ctermbg=NONE cterm=NONE + hi dirSize ctermfg=222 ctermbg=NONE cterm=NONE + hi dirSizeMod ctermfg=175 ctermbg=NONE cterm=NONE + hi FilterMenuDirectorySubtle ctermfg=102 ctermbg=NONE cterm=NONE + hi dirFilterMenuBookmarkPath ctermfg=102 ctermbg=NONE cterm=NONE + hi dirFilterMenuHistoryPath ctermfg=102 ctermbg=NONE cterm=NONE + hi FilterMenuLineNr ctermfg=102 ctermbg=NONE cterm=NONE + hi CocMenuSel ctermfg=NONE ctermbg=22 cterm=NONE + hi CocSearch ctermfg=222 ctermbg=NONE cterm=NONE + else + " Light background + hi Normal ctermfg=16 ctermbg=231 cterm=NONE + hi Statusline ctermfg=231 ctermbg=16 cterm=bold + hi StatuslineNC ctermfg=231 ctermbg=243 cterm=NONE + hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE + hi TabLine ctermfg=16 ctermbg=250 cterm=NONE + hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE + hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold,reverse + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=231 ctermbg=16 cterm=NONE + hi QuickFixLine ctermfg=231 ctermbg=32 cterm=NONE + hi CursorLineNr ctermfg=16 ctermbg=NONE cterm=bold + hi LineNr ctermfg=247 ctermbg=NONE cterm=NONE + hi NonText ctermfg=247 ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=247 ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=247 ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=247 ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=255 cterm=NONE + hi PmenuSel ctermfg=NONE ctermbg=151 cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=231 ctermbg=160 cterm=NONE + hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE + hi ModeMsg ctermfg=186 ctermbg=16 cterm=reverse + hi MoreMsg ctermfg=28 ctermbg=NONE cterm=bold + hi Question ctermfg=90 ctermbg=NONE cterm=bold + hi WarningMsg ctermfg=160 ctermbg=NONE cterm=bold + hi Todo ctermfg=23 ctermbg=231 cterm=reverse + hi Search ctermfg=16 ctermbg=186 cterm=NONE + hi IncSearch ctermfg=16 ctermbg=114 cterm=NONE + hi CurSearch ctermfg=16 ctermbg=114 cterm=NONE + hi WildMenu ctermfg=16 ctermbg=186 cterm=bold + hi debugPC ctermfg=25 ctermbg=NONE cterm=reverse + hi debugBreakpoint ctermfg=23 ctermbg=NONE cterm=reverse + hi Visual ctermfg=231 ctermbg=67 cterm=NONE + hi MatchParen ctermfg=30 ctermbg=231 cterm=reverse + hi VisualNOS ctermfg=231 ctermbg=37 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE + hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE + hi Folded ctermfg=243 ctermbg=255 cterm=NONE + hi ColorColumn ctermfg=NONE ctermbg=255 cterm=NONE + hi SpellBad ctermfg=88 ctermbg=NONE cterm=underline + hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=28 ctermbg=NONE cterm=underline + hi SpellRare ctermfg=133 ctermbg=NONE cterm=underline + hi Comment ctermfg=25 ctermbg=NONE cterm=NONE + hi Constant ctermfg=88 ctermbg=NONE cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement ctermfg=16 ctermbg=NONE cterm=bold + hi Type ctermfg=28 ctermbg=NONE cterm=bold + hi PreProc ctermfg=94 ctermbg=NONE cterm=NONE + hi Special ctermfg=23 ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi Directory ctermfg=25 ctermbg=NONE cterm=bold + hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=16 ctermbg=182 cterm=NONE + hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE + hi DiffText ctermfg=16 ctermbg=80 cterm=NONE + hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE + hi diffAdded ctermfg=28 ctermbg=NONE cterm=NONE + hi diffRemoved ctermfg=160 ctermbg=NONE cterm=NONE + hi diffSubname ctermfg=90 ctermbg=NONE cterm=NONE + hi dirType ctermfg=23 ctermbg=NONE cterm=NONE + hi dirPermissionUser ctermfg=94 ctermbg=NONE cterm=NONE + hi dirPermissionGroup ctermfg=28 ctermbg=NONE cterm=NONE + hi dirPermissionOther ctermfg=90 ctermbg=NONE cterm=NONE + hi dirOwner ctermfg=244 ctermbg=NONE cterm=NONE + hi dirGroup ctermfg=244 ctermbg=NONE cterm=NONE + hi dirTime ctermfg=244 ctermbg=NONE cterm=NONE + hi dirSize ctermfg=88 ctermbg=NONE cterm=NONE + hi dirSizeMod ctermfg=23 ctermbg=NONE cterm=NONE + hi dirLink ctermfg=28 ctermbg=NONE cterm=bold + hi dirFilterMenuBookmarkPath ctermfg=241 ctermbg=NONE cterm=NONE + hi dirFilterMenuHistoryPath ctermfg=241 ctermbg=NONE cterm=NONE + hi FilterMenuDirectorySubtle ctermfg=241 ctermbg=NONE cterm=NONE + hi FilterMenuLineNr ctermfg=241 ctermbg=NONE cterm=NONE + hi CocMenuSel ctermfg=NONE ctermbg=151 cterm=NONE + hi CocSearch ctermfg=88 ctermbg=NONE cterm=NONE + endif + unlet s:t_Co + finish +endif + +if s:t_Co >= 16 + if &background ==# 'dark' + hi Normal ctermfg=grey ctermbg=black cterm=NONE + hi Statusline ctermfg=black ctermbg=grey cterm=bold + hi StatuslineNC ctermfg=black ctermbg=darkgrey cterm=NONE + hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE + hi TabLine ctermfg=black ctermbg=grey cterm=NONE + hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE + hi TabLineSel ctermfg=white ctermbg=black cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=black ctermbg=white cterm=NONE + hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE + hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold + hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE + hi NonText ctermfg=grey ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=black ctermbg=darkgrey cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkgreen cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=white ctermbg=red cterm=NONE + hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE + hi ModeMsg ctermfg=yellow ctermbg=NONE cterm=reverse + hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE + hi Question ctermfg=magenta ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE + hi Todo ctermfg=cyan ctermbg=black cterm=reverse + hi Search ctermfg=black ctermbg=yellow cterm=NONE + hi IncSearch ctermfg=black ctermbg=green cterm=NONE + hi CurSearch ctermfg=black ctermbg=green cterm=NONE + hi WildMenu ctermfg=black ctermbg=yellow cterm=bold + hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse + hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi Visual ctermfg=white ctermbg=darkblue cterm=NONE + hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse + hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE + hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE + hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi SpellBad ctermfg=red ctermbg=NONE cterm=underline + hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=green ctermbg=NONE cterm=underline + hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline + hi Comment ctermfg=blue ctermbg=NONE cterm=NONE + hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement ctermfg=grey ctermbg=NONE cterm=bold + hi Type ctermfg=green ctermbg=NONE cterm=bold + hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi Directory ctermfg=cyan ctermbg=NONE cterm=bold + hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE + hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE + hi DiffText ctermfg=black ctermbg=cyan cterm=NONE + hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE + hi diffAdded ctermfg=green ctermbg=NONE cterm=NONE + hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE + hi diffSubname ctermfg=magenta ctermbg=NONE cterm=NONE + else + " Light background + hi Normal ctermfg=black ctermbg=white cterm=NONE + hi Statusline ctermfg=white ctermbg=black cterm=bold + hi StatuslineNC ctermfg=white ctermbg=darkgrey cterm=NONE + hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE + hi TabLine ctermfg=black ctermbg=lightgrey cterm=NONE + hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE + hi TabLineSel ctermfg=white ctermbg=black cterm=bold,reverse + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=white ctermbg=black cterm=NONE + hi QuickFixLine ctermfg=white ctermbg=blue cterm=NONE + hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold + hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=black ctermbg=grey cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkgreen cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=white ctermbg=red cterm=NONE + hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE + hi ModeMsg ctermfg=yellow ctermbg=black cterm=reverse + hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold + hi Question ctermfg=darkmagenta ctermbg=NONE cterm=bold + hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold + hi Todo ctermfg=darkcyan ctermbg=white cterm=reverse + hi Search ctermfg=black ctermbg=yellow cterm=NONE + hi IncSearch ctermfg=black ctermbg=green cterm=NONE + hi CurSearch ctermfg=black ctermbg=green cterm=NONE + hi WildMenu ctermfg=black ctermbg=yellow cterm=bold + hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse + hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi Visual ctermfg=white ctermbg=darkblue cterm=NONE + hi MatchParen ctermfg=darkcyan ctermbg=white cterm=reverse + hi VisualNOS ctermfg=black ctermbg=cyan cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE + hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE + hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline + hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline + hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline + hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement ctermfg=black ctermbg=NONE cterm=bold + hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold + hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold + hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE + hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE + hi DiffText ctermfg=black ctermbg=cyan cterm=NONE + hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE + hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi diffRemoved ctermfg=red ctermbg=NONE cterm=NONE + hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE + endif + unlet s:t_Co + finish +endif + +if s:t_Co >= 8 + if &background ==# 'dark' + hi Normal ctermfg=grey ctermbg=black cterm=NONE + hi Statusline ctermfg=grey ctermbg=black cterm=bold,reverse + hi StatuslineNC ctermfg=black ctermbg=grey cterm=NONE + hi VertSplit ctermfg=grey ctermbg=grey cterm=NONE + hi TabLine ctermfg=grey ctermbg=black cterm=reverse + hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE + hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse + hi QuickFixLine ctermfg=grey ctermbg=darkblue cterm=bold + hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold + hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi NonText ctermfg=black ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=black ctermbg=grey cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkgreen cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=grey ctermbg=darkred cterm=NONE + hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE + hi ModeMsg ctermfg=darkyellow ctermbg=black cterm=reverse + hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE + hi Todo ctermfg=darkcyan ctermbg=black cterm=reverse + hi Search ctermfg=darkyellow ctermbg=black cterm=reverse + hi IncSearch ctermfg=darkgreen ctermbg=black cterm=reverse + hi CurSearch ctermfg=darkgreen ctermbg=black cterm=reverse + hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold + hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse + hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi Visual ctermfg=black ctermbg=darkblue cterm=NONE + hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse + hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE + hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse,underline + hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse,underline + hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse,underline + hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse,underline + hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement ctermfg=black ctermbg=NONE cterm=bold + hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold + hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi Title ctermfg=NONE ctermbg=NONE cterm=bold + hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold + hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE + hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE + hi DiffText ctermfg=black ctermbg=grey cterm=NONE + hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE + else + " Light background + hi Normal ctermfg=black ctermbg=grey cterm=NONE + hi Statusline ctermfg=grey ctermbg=black cterm=bold + hi StatuslineNC ctermfg=grey ctermbg=darkgrey cterm=NONE + hi VertSplit ctermfg=black ctermbg=black cterm=NONE + hi TabLine ctermfg=black ctermbg=grey cterm=reverse + hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE + hi TabLineSel ctermfg=black ctermbg=grey cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold + hi QuickFixLine ctermfg=grey ctermbg=darkblue cterm=bold + hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold + hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi NonText ctermfg=black ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=grey ctermbg=black cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkgreen cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=grey ctermbg=darkred cterm=NONE + hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE + hi ModeMsg ctermfg=darkyellow ctermbg=black cterm=reverse + hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE + hi Todo ctermfg=darkcyan ctermbg=black cterm=reverse + hi Search ctermfg=black ctermbg=darkyellow cterm=NONE + hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE + hi CurSearch ctermfg=black ctermbg=darkgreen cterm=NONE + hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold + hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse + hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi Visual ctermfg=grey ctermbg=darkblue cterm=NONE + hi MatchParen ctermfg=darkcyan ctermbg=grey cterm=reverse + hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE + hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse,underline + hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse,underline + hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse,underline + hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse,underline + hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement ctermfg=black ctermbg=NONE cterm=bold + hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold + hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi Title ctermfg=black ctermbg=NONE cterm=bold + hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold + hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE + hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE + hi DiffText ctermfg=grey ctermbg=black cterm=NONE + hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE + endif + unlet s:t_Co + finish +endif + +if s:t_Co >= 0 + hi Normal term=NONE + hi ColorColumn term=reverse + hi Conceal term=NONE + hi Cursor term=reverse + hi CursorColumn term=NONE + hi CursorLine term=underline + hi CursorLineNr term=bold + hi DiffAdd term=reverse + hi DiffChange term=NONE + hi DiffDelete term=reverse + hi DiffText term=reverse + hi Directory term=NONE + hi EndOfBuffer term=NONE + hi ErrorMsg term=bold,reverse + hi FoldColumn term=NONE + hi Folded term=NONE + hi IncSearch term=bold,reverse,underline + hi LineNr term=NONE + hi MatchParen term=bold,underline + hi ModeMsg term=bold + hi MoreMsg term=NONE + hi NonText term=NONE + hi Pmenu term=reverse + hi PmenuSbar term=reverse + hi PmenuSel term=bold + hi PmenuThumb term=NONE + hi Question term=standout + hi Search term=reverse + hi SignColumn term=reverse + hi SpecialKey term=bold + hi SpellBad term=underline + hi SpellCap term=underline + hi SpellLocal term=underline + hi SpellRare term=underline + hi StatusLine term=bold,reverse + hi StatusLineNC term=bold,underline + hi TabLine term=bold,underline + hi TabLineFill term=NONE + hi Terminal term=NONE + hi TabLineSel term=bold,reverse + hi Title term=NONE + hi VertSplit term=NONE + hi Visual term=reverse + hi VisualNOS term=NONE + hi WarningMsg term=standout + hi WildMenu term=bold + hi CursorIM term=NONE + hi ToolbarLine term=reverse + hi ToolbarButton term=bold,reverse + hi CurSearch term=reverse + hi CursorLineFold term=underline + hi CursorLineSign term=underline + hi Comment term=bold + hi Constant term=NONE + hi Error term=bold,reverse + hi Identifier term=NONE + hi Ignore term=NONE + hi PreProc term=NONE + hi Special term=NONE + hi Statement term=NONE + hi Todo term=bold,reverse + hi Type term=NONE + hi Underlined term=underline + unlet s:t_Co + finish +endif + +" Background: any +" Background: dark +" Color: color00 #000000 16 black +" Color: color08 #767676 243 darkgrey +" Color: color01 #AF5F5F 131 darkred +" Color: color09 #FF5F5F 203 red +" Color: color02 #5FAF5F 71 darkgreen +" Color: color10 #5FD75F 77 green +" Color: color03 #AF875F 137 darkyellow +" Color: color11 #FFD787 222 yellow +" Color: color04 #5F87AF 67 darkblue +" Color: color12 #87AFD7 110 blue +" Color: color05 #D787AF 175 darkmagenta +" Color: color13 #FFAFD7 218 magenta +" Color: color06 #5FAFAF 73 darkcyan +" Color: color14 #5FD7D7 116 cyan +" Color: color07 #C6C6C6 251 grey +" Color: color15 #FFFFFF 231 white +" Color: colorDimWhite #EEEEEE 255 grey +" Color: colorLine #262626 235 darkgrey +" Color: colorB #1C1C1C 234 darkgrey +" Color: colorNonT #585858 240 grey +" Color: colorTab #585858 240 grey +" Color: colorC #FFFFFF 231 white +" Color: colorlC #FF5FFF 207 magenta +" Color: colorV #005F87 24 darkblue +" Color: colorMP #C5E7C5 30 darkcyan +" Color: colorPMenuSel #005F00 22 darkgreen +" Color: colorDim #878787 102 grey +" Color: diffAdd #AF87AF 139 darkmagenta +" Color: diffDelete #D78787 174 darkred +" Color: diffChange #D0D0D0 252 lightgray +" Color: diffText #5FD7D7 80 cyan +" Color: fgDiff #000000 16 black +" Term colors: color00 color01 color02 color03 color04 color05 color06 color07 +" Term colors: color08 color09 color10 color11 color12 color13 color14 color15 +" Background: light +" Color: color00 #000000 16 black +" Color: color08 #767676 243 darkgrey +" Color: color01 #870000 88 darkred +" Color: color09 #D70000 160 red +" Color: color02 #008700 28 darkgreen +" Color: color10 #87D787 114 green +" Color: color03 #875F00 94 darkyellow +" Color: color11 #D7D787 186 yellow +" Color: color04 #005FAF 25 darkblue +" Color: color12 #0087D7 32 blue +" Color: color05 #870087 90 darkmagenta +" Color: color13 #AF00AF 133 magenta +" Color: color06 #005F5F 23 darkcyan +" Color: color14 #00AFAF 37 cyan +" Color: color07 #808080 244 grey +" Color: color15 #FFFFFF 231 white +" Color: colorLine #E4E4E4 254 grey +" Color: colorB #EEEEEE 255 grey +" Color: colorNonT #9E9E9E 247 darkgrey +" Color: colorTab #BCBCBC 250 lightgrey +" Color: colorC #000000 16 black +" Color: colorlC #FF00FF 201 magenta +" Color: colorV #5F87AF 67 darkblue +" Color: colorMP #C5E7C5 30 darkcyan +" Color: colorPMenuSel #AFD7AF 151 darkgreen +" Color: colorDim #626262 241 darkgrey +" Color: diffAdd #D7AFD7 182 darkmagenta +" Color: diffDelete #870000 88 darkred +" Color: diffChange #D0D0D0 252 lightgray +" Color: diffText #5FD7D7 80 cyan +" Color: fgDiff #000000 16 black +" Term colors: color00 color01 color02 color03 color04 color05 color06 color07 +" Term colors: color08 color09 color10 color11 color12 color13 color14 color15 +" Background: any +" vim: et ts=2 sw=2 diff --git a/runtime/colors/morning.vim b/runtime/colors/morning.vim --- a/runtime/colors/morning.vim +++ b/runtime/colors/morning.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Bram Moolenaar " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:07 +" Last Updated: Mon Aug 8 15:21:13 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=light hi clear let g:colors_name = 'morning' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#e4e4e4', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#bcbcbc', '#0000ff', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#000000'] diff --git a/runtime/colors/murphy.vim b/runtime/colors/murphy.vim --- a/runtime/colors/murphy.vim +++ b/runtime/colors/murphy.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Ron Aaron . " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:08 +" Last Updated: Mon Aug 8 15:21:14 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'murphy' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#303030', '#ffa700', '#005f00', '#ffd7af', '#87afff', '#ffafaf', '#00afaf', '#bcbcbc', '#444444', '#ff0000', '#00875f', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff'] diff --git a/runtime/colors/pablo.vim b/runtime/colors/pablo.vim --- a/runtime/colors/pablo.vim +++ b/runtime/colors/pablo.vim @@ -3,7 +3,7 @@ " Maintainer: Original maintainerRon Aaron " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:09 +" Last Updated: Mon Aug 8 15:21:15 2022 " Generated by Colortemplate v2.2.0 @@ -12,7 +12,7 @@ set background=dark hi clear let g:colors_name = 'pablo' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff'] diff --git a/runtime/colors/peachpuff.vim b/runtime/colors/peachpuff.vim --- a/runtime/colors/peachpuff.vim +++ b/runtime/colors/peachpuff.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer David Ne\v{c}as (Yeti) " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:10 +" Last Updated: Mon Aug 8 15:21:16 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=light hi clear let g:colors_name = 'peachpuff' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#ffdab9', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#737373', '#406090', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#000000'] diff --git a/runtime/colors/quiet.vim b/runtime/colors/quiet.vim --- a/runtime/colors/quiet.vim +++ b/runtime/colors/quiet.vim @@ -4,15 +4,16 @@ " Maintainer: neutaaaaan " Website: https://github.com/vim/colorschemes " License: Vim License (see `:help license`)` -" Last Updated: 2022-08-01 15:13:21 +" Last Updated: 2022-08-14 15:17:11 " Generated by Colortemplate v2.2.0 hi clear let g:colors_name = 'quiet' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 +hi! link Terminal Normal hi! link StatusLineTerm StatusLine hi! link StatusLineTermNC StatusLineNC hi! link Boolean Constant @@ -48,7 +49,6 @@ if &background ==# 'dark' let g:terminal_ansi_colors = ['#080808', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff'] endif hi Normal guifg=#dadada guibg=#080808 gui=NONE cterm=NONE - hi Terminal guifg=#dadada guibg=#080808 gui=NONE cterm=NONE hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse @@ -62,39 +62,39 @@ if &background ==# 'dark' hi Directory guifg=#dadada guibg=#080808 gui=NONE cterm=NONE hi EndOfBuffer guifg=#dadada guibg=#080808 gui=NONE cterm=NONE hi ErrorMsg guifg=#dadada guibg=#080808 gui=reverse cterm=reverse - hi FoldColumn guifg=#707070 guibg=#080808 gui=NONE cterm=NONE + hi FoldColumn guifg=#707070 guibg=NONE gui=NONE cterm=NONE hi Folded guifg=#707070 guibg=#080808 gui=NONE cterm=NONE hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse - hi LineNr guifg=#444444 guibg=#080808 gui=NONE cterm=NONE - hi MatchParen guifg=#ff00af guibg=#080808 gui=bold cterm=bold - hi ModeMsg guifg=#dadada guibg=#080808 gui=bold cterm=bold - hi MoreMsg guifg=#dadada guibg=#080808 gui=NONE cterm=NONE + hi LineNr guifg=#444444 guibg=NONE gui=NONE cterm=NONE + hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold + hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold + hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE hi Pmenu guifg=#080808 guibg=#87afd7 gui=NONE cterm=NONE hi PmenuSbar guifg=#dadada guibg=#707070 gui=NONE cterm=NONE hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE hi PmenuThumb guifg=#dadada guibg=#d787d7 gui=NONE cterm=NONE - hi Question guifg=#dadada guibg=#080808 gui=NONE cterm=NONE + hi Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse - hi SignColumn guifg=#dadada guibg=#080808 gui=NONE cterm=NONE - hi SpecialKey guifg=#dadada guibg=#080808 gui=NONE cterm=NONE - hi SpellBad guifg=#d7005f guibg=#080808 guisp=#d7005f gui=undercurl cterm=underline - hi SpellCap guifg=#0087d7 guibg=#080808 guisp=#0087d7 gui=undercurl cterm=underline - hi SpellLocal guifg=#d787d7 guibg=#080808 guisp=#d787d7 gui=undercurl cterm=underline - hi SpellRare guifg=#00afaf guibg=#080808 guisp=#00afaf gui=undercurl cterm=underline + hi SignColumn guifg=#dadada guibg=NONE gui=NONE cterm=NONE + hi SpecialKey guifg=#dadada guibg=NONE gui=NONE cterm=NONE + hi SpellBad guifg=#d7005f guibg=NONE guisp=#d7005f gui=undercurl cterm=underline + hi SpellCap guifg=#0087d7 guibg=NONE guisp=#0087d7 gui=undercurl cterm=underline + hi SpellLocal guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline + hi SpellRare guifg=#00afaf guibg=NONE guisp=#00afaf gui=undercurl cterm=underline hi StatusLine guifg=#080808 guibg=#dadada gui=bold cterm=bold hi StatusLineNC guifg=#707070 guibg=#080808 gui=underline cterm=underline hi TabLine guifg=#707070 guibg=#080808 gui=underline cterm=underline hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE hi TabLineSel guifg=#080808 guibg=#dadada gui=bold cterm=bold - hi Title guifg=#dadada guibg=#080808 gui=NONE cterm=NONE + hi Title guifg=#dadada guibg=NONE gui=NONE cterm=NONE hi VertSplit guifg=#707070 guibg=#080808 gui=NONE cterm=NONE hi Visual guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse hi VisualNOS guifg=NONE guibg=#303030 gui=NONE cterm=NONE - hi WarningMsg guifg=#dadada guibg=#080808 gui=NONE cterm=NONE + hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE hi WildMenu guifg=#00afff guibg=#080808 gui=bold cterm=bold - hi Comment guifg=#707070 guibg=#080808 gui=bold cterm=bold + hi Comment guifg=#707070 guibg=NONE gui=bold cterm=bold hi Constant guifg=#dadada guibg=NONE gui=NONE cterm=NONE hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse hi Identifier guifg=#dadada guibg=NONE gui=NONE cterm=NONE @@ -114,7 +114,6 @@ else let g:terminal_ansi_colors = ['#080808', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff'] endif hi Normal guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE - hi Terminal guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse @@ -125,26 +124,26 @@ else hi DiffChange guifg=#afafd7 guibg=#080808 gui=reverse cterm=reverse hi DiffDelete guifg=#d78787 guibg=#080808 gui=reverse cterm=reverse hi DiffText guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse - hi Directory guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE - hi EndOfBuffer guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE + hi Directory guifg=#080808 guibg=NONE gui=NONE cterm=NONE + hi EndOfBuffer guifg=#080808 guibg=NONE gui=NONE cterm=NONE hi ErrorMsg guifg=#080808 guibg=#d7d7d7 gui=reverse cterm=reverse - hi FoldColumn guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE + hi FoldColumn guifg=#626262 guibg=NONE gui=NONE cterm=NONE hi Folded guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse - hi LineNr guifg=#a8a8a8 guibg=#d7d7d7 gui=NONE cterm=NONE + hi LineNr guifg=#a8a8a8 guibg=NONE gui=NONE cterm=NONE hi MatchParen guifg=#ff00af guibg=#d7d7d7 gui=bold cterm=bold - hi ModeMsg guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold - hi MoreMsg guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE + hi ModeMsg guifg=#080808 guibg=NONE gui=bold cterm=bold + hi MoreMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE hi NonText guifg=#626262 guibg=NONE gui=NONE cterm=NONE hi Pmenu guifg=#080808 guibg=#afafd7 gui=NONE cterm=NONE hi PmenuSbar guifg=#080808 guibg=#626262 gui=NONE cterm=NONE hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE hi PmenuThumb guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE - hi Question guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE + hi Question guifg=#080808 guibg=NONE gui=NONE cterm=NONE hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse - hi SignColumn guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE - hi SpecialKey guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE + hi SignColumn guifg=#080808 guibg=NONE gui=NONE cterm=NONE + hi SpecialKey guifg=#080808 guibg=NONE gui=NONE cterm=NONE hi SpellBad guifg=#af0000 guibg=#d7d7d7 guisp=#af0000 gui=undercurl cterm=underline hi SpellCap guifg=#005faf guibg=#d7d7d7 guisp=#005faf gui=undercurl cterm=underline hi SpellLocal guifg=#870087 guibg=#d7d7d7 guisp=#870087 gui=undercurl cterm=underline @@ -154,13 +153,13 @@ else hi TabLine guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE hi TabLineFill guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE hi TabLineSel guifg=#eeeeee guibg=#080808 gui=bold cterm=bold - hi Title guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE + hi Title guifg=#080808 guibg=NONE gui=NONE cterm=NONE hi VertSplit guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE hi Visual guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse hi VisualNOS guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE - hi WarningMsg guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE + hi WarningMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE hi WildMenu guifg=#080808 guibg=#eeeeee gui=bold cterm=bold - hi Comment guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold + hi Comment guifg=#080808 guibg=NONE gui=bold cterm=bold hi Constant guifg=#080808 guibg=NONE gui=NONE cterm=NONE hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse hi Identifier guifg=#080808 guibg=NONE gui=NONE cterm=NONE @@ -179,7 +178,6 @@ endif if s:t_Co >= 256 if &background ==# 'dark' hi Normal ctermfg=253 ctermbg=232 cterm=NONE - hi Terminal ctermfg=253 ctermbg=232 cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse @@ -193,39 +191,39 @@ if s:t_Co >= 256 hi Directory ctermfg=253 ctermbg=232 cterm=NONE hi EndOfBuffer ctermfg=253 ctermbg=232 cterm=NONE hi ErrorMsg ctermfg=253 ctermbg=232 cterm=reverse - hi FoldColumn ctermfg=242 ctermbg=232 cterm=NONE + hi FoldColumn ctermfg=242 ctermbg=NONE cterm=NONE hi Folded ctermfg=242 ctermbg=232 cterm=NONE hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse - hi LineNr ctermfg=238 ctermbg=232 cterm=NONE - hi MatchParen ctermfg=199 ctermbg=232 cterm=bold - hi ModeMsg ctermfg=253 ctermbg=232 cterm=bold - hi MoreMsg ctermfg=253 ctermbg=232 cterm=NONE + hi LineNr ctermfg=238 ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold + hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=253 ctermbg=NONE cterm=NONE hi NonText ctermfg=242 ctermbg=NONE cterm=NONE hi Pmenu ctermfg=232 ctermbg=110 cterm=NONE hi PmenuSbar ctermfg=253 ctermbg=242 cterm=NONE hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE hi PmenuThumb ctermfg=253 ctermbg=176 cterm=NONE - hi Question ctermfg=253 ctermbg=232 cterm=NONE + hi Question ctermfg=253 ctermbg=NONE cterm=NONE hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse hi Search ctermfg=39 ctermbg=232 cterm=reverse - hi SignColumn ctermfg=253 ctermbg=232 cterm=NONE - hi SpecialKey ctermfg=253 ctermbg=232 cterm=NONE - hi SpellBad ctermfg=161 ctermbg=232 cterm=underline - hi SpellCap ctermfg=32 ctermbg=232 cterm=underline - hi SpellLocal ctermfg=176 ctermbg=232 cterm=underline - hi SpellRare ctermfg=37 ctermbg=232 cterm=underline + hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=253 ctermbg=NONE cterm=NONE + hi SpellBad ctermfg=161 ctermbg=NONE cterm=underline + hi SpellCap ctermfg=32 ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=176 ctermbg=NONE cterm=underline + hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline hi StatusLine ctermfg=232 ctermbg=253 cterm=bold hi StatusLineNC ctermfg=242 ctermbg=232 cterm=underline hi TabLine ctermfg=242 ctermbg=232 cterm=underline hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE hi TabLineSel ctermfg=232 ctermbg=253 cterm=bold - hi Title ctermfg=253 ctermbg=232 cterm=NONE + hi Title ctermfg=253 ctermbg=NONE cterm=NONE hi VertSplit ctermfg=242 ctermbg=232 cterm=NONE hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=236 cterm=NONE - hi WarningMsg ctermfg=253 ctermbg=232 cterm=NONE + hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE hi WildMenu ctermfg=39 ctermbg=232 cterm=bold - hi Comment ctermfg=242 ctermbg=232 cterm=bold + hi Comment ctermfg=242 ctermbg=NONE cterm=bold hi Constant ctermfg=253 ctermbg=NONE cterm=NONE hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse hi Identifier ctermfg=253 ctermbg=NONE cterm=NONE @@ -242,7 +240,6 @@ if s:t_Co >= 256 else " Light background hi Normal ctermfg=232 ctermbg=188 cterm=NONE - hi Terminal ctermfg=232 ctermbg=188 cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse @@ -253,26 +250,26 @@ if s:t_Co >= 256 hi DiffChange ctermfg=146 ctermbg=232 cterm=reverse hi DiffDelete ctermfg=174 ctermbg=232 cterm=reverse hi DiffText ctermfg=176 ctermbg=232 cterm=reverse - hi Directory ctermfg=232 ctermbg=188 cterm=NONE - hi EndOfBuffer ctermfg=232 ctermbg=188 cterm=NONE + hi Directory ctermfg=232 ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=232 ctermbg=NONE cterm=NONE hi ErrorMsg ctermfg=232 ctermbg=188 cterm=reverse - hi FoldColumn ctermfg=241 ctermbg=188 cterm=NONE + hi FoldColumn ctermfg=241 ctermbg=NONE cterm=NONE hi Folded ctermfg=241 ctermbg=188 cterm=NONE hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse - hi LineNr ctermfg=248 ctermbg=188 cterm=NONE + hi LineNr ctermfg=248 ctermbg=NONE cterm=NONE hi MatchParen ctermfg=199 ctermbg=188 cterm=bold - hi ModeMsg ctermfg=232 ctermbg=188 cterm=bold - hi MoreMsg ctermfg=232 ctermbg=188 cterm=NONE + hi ModeMsg ctermfg=232 ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=232 ctermbg=NONE cterm=NONE hi NonText ctermfg=241 ctermbg=NONE cterm=NONE hi Pmenu ctermfg=232 ctermbg=146 cterm=NONE hi PmenuSbar ctermfg=232 ctermbg=241 cterm=NONE hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE hi PmenuThumb ctermfg=232 ctermbg=176 cterm=NONE - hi Question ctermfg=232 ctermbg=188 cterm=NONE + hi Question ctermfg=232 ctermbg=NONE cterm=NONE hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse hi Search ctermfg=39 ctermbg=232 cterm=reverse - hi SignColumn ctermfg=232 ctermbg=188 cterm=NONE - hi SpecialKey ctermfg=232 ctermbg=188 cterm=NONE + hi SignColumn ctermfg=232 ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=232 ctermbg=NONE cterm=NONE hi SpellBad ctermfg=124 ctermbg=188 cterm=underline hi SpellCap ctermfg=25 ctermbg=188 cterm=underline hi SpellLocal ctermfg=90 ctermbg=188 cterm=underline @@ -282,13 +279,13 @@ if s:t_Co >= 256 hi TabLine ctermfg=232 ctermbg=248 cterm=NONE hi TabLineFill ctermfg=232 ctermbg=188 cterm=NONE hi TabLineSel ctermfg=255 ctermbg=232 cterm=bold - hi Title ctermfg=232 ctermbg=188 cterm=NONE + hi Title ctermfg=232 ctermbg=NONE cterm=NONE hi VertSplit ctermfg=241 ctermbg=188 cterm=NONE hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse hi VisualNOS ctermfg=NONE ctermbg=255 cterm=NONE - hi WarningMsg ctermfg=232 ctermbg=188 cterm=NONE + hi WarningMsg ctermfg=232 ctermbg=NONE cterm=NONE hi WildMenu ctermfg=232 ctermbg=255 cterm=bold - hi Comment ctermfg=232 ctermbg=188 cterm=bold + hi Comment ctermfg=232 ctermbg=NONE cterm=bold hi Constant ctermfg=232 ctermbg=NONE cterm=NONE hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse hi Identifier ctermfg=232 ctermbg=NONE cterm=NONE @@ -310,23 +307,22 @@ endif if s:t_Co >= 16 if &background ==# 'dark' hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE - hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold - hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse - hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse - hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse - hi DiffText ctermfg=5 ctermbg=0 cterm=reverse + hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse + hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse + hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse + hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE - hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline + hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold @@ -337,14 +333,14 @@ if s:t_Co >= 16 hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE hi Question ctermfg=NONE ctermbg=NONE cterm=standout - hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse - hi Search ctermfg=6 ctermbg=0 cterm=reverse + hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse + hi Search ctermfg=darkcyan ctermbg=black cterm=reverse hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold - hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline + hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline + hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline @@ -373,23 +369,22 @@ if s:t_Co >= 16 else " Light background hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE - hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold - hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse - hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse - hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse - hi DiffText ctermfg=5 ctermbg=0 cterm=reverse + hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse + hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse + hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse + hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE - hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline + hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold @@ -400,14 +395,14 @@ if s:t_Co >= 16 hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE hi Question ctermfg=NONE ctermbg=NONE cterm=standout - hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse - hi Search ctermfg=6 ctermbg=0 cterm=reverse + hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse + hi Search ctermfg=darkcyan ctermbg=black cterm=reverse hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold - hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline + hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline + hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline @@ -441,23 +436,22 @@ endif if s:t_Co >= 8 if &background ==# 'dark' hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE - hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold - hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse - hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse - hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse - hi DiffText ctermfg=5 ctermbg=0 cterm=reverse + hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse + hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse + hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse + hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE - hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline + hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold @@ -468,14 +462,14 @@ if s:t_Co >= 8 hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE hi Question ctermfg=NONE ctermbg=NONE cterm=standout - hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse - hi Search ctermfg=6 ctermbg=0 cterm=reverse + hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse + hi Search ctermfg=darkcyan ctermbg=black cterm=reverse hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold - hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline + hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline + hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline @@ -504,23 +498,22 @@ if s:t_Co >= 8 else " Light background hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE - hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold - hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse - hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse - hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse - hi DiffText ctermfg=5 ctermbg=0 cterm=reverse + hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse + hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse + hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse + hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE - hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline + hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold @@ -531,14 +524,14 @@ if s:t_Co >= 8 hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE hi Question ctermfg=NONE ctermbg=NONE cterm=standout - hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse - hi Search ctermfg=6 ctermbg=0 cterm=reverse + hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse + hi Search ctermfg=darkcyan ctermbg=black cterm=reverse hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold - hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline + hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline + hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline @@ -638,69 +631,69 @@ if s:t_Co >= 0 endif " Background: dark -" Color: dark0 #080808 ~ 0 -" Color: dark1 #d7005f ~ 1 -" Color: dark2 #00af5f ~ 2 -" Color: dark3 #d78700 ~ 3 -" Color: dark4 #0087d7 ~ 4 -" Color: dark5 #d787d7 ~ 5 -" Color: dark6 #00afaf ~ 6 -" Color: dark7 #dadada ~ 7 -" Color: dark8 #707070 ~ 8 -" Color: dark9 #ff005f ~ 9 -" Color: dark10 #00d75f ~ 10 -" Color: dark11 #ffaf00 ~ 11 -" Color: dark12 #5fafff ~ 12 -" Color: dark13 #ff87ff ~ 13 -" Color: dark14 #00d7d7 ~ 14 -" Color: dark15 #ffffff ~ 15 -" Color: diffred #d75f5f ~ -" Color: diffgreen #00af00 ~ -" Color: diffblue #87afd7 ~ -" Color: diffpink #d787d7 ~ -" Color: uipink #ff00af ~ -" Color: uilime #afff00 ~ -" Color: uiteal #00ffaf ~ -" Color: uiblue #00afff ~ -" Color: uipurple #af00ff ~ -" Color: uiamber #ffaf00 ~ -" Color: uiblack #303030 ~ -" Color: yasogrey #1c1c1c ~ -" Color: linenrblack #444444 ~ -" Color: errorred #ff005f ~ +" Color: dark0 #080808 232 black +" Color: dark1 #d7005f 161 darkred +" Color: dark2 #00af5f 35 darkgreen +" Color: dark3 #d78700 172 darkyellow +" Color: dark4 #0087d7 32 darkblue +" Color: dark5 #d787d7 176 darkmagenta +" Color: dark6 #00afaf 37 darkcyan +" Color: dark7 #dadada 253 grey +" Color: dark8 #707070 242 darkgrey +" Color: dark9 #ff005f 197 red +" Color: dark10 #00d75f 41 green +" Color: dark11 #ffaf00 214 yellow +" Color: dark12 #5fafff 75 blue +" Color: dark13 #ff87ff 213 magenta +" Color: dark14 #00d7d7 44 cyan +" Color: dark15 #ffffff 231 white +" Color: diffred #d75f5f 167 darkred +" Color: diffgreen #00af00 34 darkgreen +" Color: diffblue #87afd7 110 darkblue +" Color: diffpink #d787d7 176 darkmagenta +" Color: uipink #ff00af 199 magenta +" Color: uilime #afff00 154 green +" Color: uiteal #00ffaf 49 green +" Color: uiblue #00afff 39 blue +" Color: uipurple #af00ff 129 darkmagenta +" Color: uiamber #ffaf00 214 darkyellow +" Color: uiblack #303030 236 darkgrey +" Color: yasogrey #1c1c1c 234 black +" Color: linenrblack #444444 238 darkgrey +" Color: errorred #ff005f 197 red " Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7 " Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15 " Background: light -" Color: brightwhite #eeeeee ~ -" Color: light0 #080808 ~ 0 -" Color: light1 #af0000 ~ 1 -" Color: light2 #005f00 ~ 2 -" Color: light3 #af5f00 ~ 3 -" Color: light4 #005faf ~ 4 -" Color: light5 #870087 ~ 5 -" Color: light6 #008787 ~ 6 -" Color: light7 #d7d7d7 ~ 7 -" Color: light8 #626262 ~ 8 -" Color: light9 #d70000 ~ 9 -" Color: light10 #008700 ~ 10 -" Color: light11 #d78700 ~ 11 -" Color: light12 #0087d7 ~ 12 -" Color: light13 #af00af ~ 13 -" Color: light14 #00afaf ~ 14 -" Color: light15 #ffffff ~ 15 -" Color: diffred #d78787 ~ -" Color: diffgreen #87d787 ~ -" Color: diffblue #afafd7 ~ -" Color: diffpink #d787d7 ~ -" Color: uipink #ff00af ~ -" Color: uilime #afff00 ~ -" Color: uiteal #00ffaf ~ -" Color: uiblue #00afff ~ -" Color: uipurple #af00ff ~ -" Color: uiamber #ffaf00 ~ -" Color: invisigrey #a8a8a8 ~ -" Color: yasogrey #e4e4e4 ~ -" Color: errorred #ff005f ~ +" Color: brightwhite #eeeeee 255 grey +" Color: light0 #080808 232 black +" Color: light1 #af0000 124 darkred +" Color: light2 #005f00 22 darkgreen +" Color: light3 #af5f00 130 darkyellow +" Color: light4 #005faf 25 darkblue +" Color: light5 #870087 90 darkmagenta +" Color: light6 #008787 30 darkcyan +" Color: light7 #d7d7d7 188 grey +" Color: light8 #626262 241 darkgrey +" Color: light9 #d70000 160 red +" Color: light10 #008700 28 green +" Color: light11 #d78700 172 yellow +" Color: light12 #0087d7 32 blue +" Color: light13 #af00af 127 magenta +" Color: light14 #00afaf 37 cyan +" Color: light15 #ffffff 231 white +" Color: diffred #d78787 174 red +" Color: diffgreen #87d787 114 green +" Color: diffblue #afafd7 146 blue +" Color: diffpink #d787d7 176 magenta +" Color: uipink #ff00af 199 magenta +" Color: uilime #afff00 154 green +" Color: uiteal #00ffaf 49 cyan +" Color: uiblue #00afff 39 blue +" Color: uipurple #af00ff 129 darkmagenta +" Color: uiamber #ffaf00 214 yellow +" Color: invisigrey #a8a8a8 248 darkgrey +" Color: yasogrey #e4e4e4 254 grey +" Color: errorred #ff005f 197 red " Term colors: light0 light1 light2 light3 light4 light5 light6 light7 " Term colors: light8 light9 light10 light11 light12 light13 light14 light15 " Background: any diff --git a/runtime/colors/ron.vim b/runtime/colors/ron.vim --- a/runtime/colors/ron.vim +++ b/runtime/colors/ron.vim @@ -3,7 +3,7 @@ " Maintainer: original maintainer Ron Aaron " Website: https://www.github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:11 +" Last Updated: Mon Aug 8 15:21:18 2022 " Generated by Colortemplate v2.2.0 @@ -12,7 +12,7 @@ set background=dark hi clear let g:colors_name = 'ron' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 hi! link Terminal Normal hi! link Boolean Constant diff --git a/runtime/colors/shine.vim b/runtime/colors/shine.vim --- a/runtime/colors/shine.vim +++ b/runtime/colors/shine.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer is Yasuhiro Matsumoto " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:12 +" Last Updated: Mon Aug 8 15:21:19 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=light hi clear let g:colors_name = 'shine' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#000000', '#8b0000', '#006400', '#ffff00', '#00008b', '#6a0dad', '#008b8b', '#dadada', '#767676', '#ffafaf', '#90ee90', '#ffff60', '#add8e6', '#ff00ff', '#00ffff', '#ffffff'] diff --git a/runtime/colors/slate.vim b/runtime/colors/slate.vim --- a/runtime/colors/slate.vim +++ b/runtime/colors/slate.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Ralph Amissah " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:14 +" Last Updated: Tue Aug 16 08:11:08 2022 " Generated by Colortemplate v2.2.0 @@ -13,10 +13,10 @@ set background=dark hi clear let g:colors_name = 'slate' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') - let g:terminal_ansi_colors = ['#000000', '#ff0000', '#5f8700', '#ffff00', '#87d7ff', '#d7d787', '#ffd7af', '#666666', '#333333', '#ffafaf', '#00875f', '#ffd700', '#5f87d7', '#afaf87', '#ff8787', '#ffffff'] + let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff'] endif hi! link Terminal Normal hi! link LineNrAbove LineNr @@ -53,18 +53,18 @@ hi Visual guifg=#d7d787 guibg=#5f8700 gu hi SignColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE hi VisualNOS guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE hi LineNr guifg=#666666 guibg=NONE gui=NONE cterm=NONE -hi Underlined guifg=#5f87d7 guibg=NONE gui=underline cterm=underline hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse hi ErrorMsg guifg=#ff0000 guibg=#000000 gui=reverse cterm=reverse hi ModeMsg guifg=#262626 guibg=#ffd700 gui=NONE cterm=NONE hi WarningMsg guifg=#ff8787 guibg=NONE gui=NONE cterm=NONE hi MoreMsg guifg=#00875f guibg=NONE gui=NONE cterm=NONE hi Question guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE -hi Todo guifg=#ff0000 guibg=#ffff00 gui=NONE cterm=NONE hi MatchParen guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE hi Search guifg=#000000 guibg=#d7875f gui=NONE cterm=NONE hi IncSearch guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE +hi Todo guifg=#ff0000 guibg=#ffff00 gui=NONE cterm=NONE hi WildMenu guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE +hi Underlined guifg=#5f87d7 guibg=NONE gui=underline cterm=underline hi Cursor guifg=#333333 guibg=#d7d787 gui=NONE cterm=NONE hi lCursor guifg=#262626 guibg=#ffafaf gui=NONE cterm=NONE hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline @@ -128,18 +128,18 @@ if s:t_Co >= 256 hi SignColumn ctermfg=NONE ctermbg=235 cterm=NONE hi VisualNOS ctermfg=186 ctermbg=64 cterm=NONE hi LineNr ctermfg=241 ctermbg=NONE cterm=NONE - hi Underlined ctermfg=68 ctermbg=NONE cterm=underline hi Error ctermfg=196 ctermbg=231 cterm=reverse hi ErrorMsg ctermfg=196 ctermbg=16 cterm=reverse hi ModeMsg ctermfg=235 ctermbg=220 cterm=NONE hi WarningMsg ctermfg=210 ctermbg=NONE cterm=NONE hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE hi Question ctermfg=220 ctermbg=NONE cterm=NONE - hi Todo ctermfg=196 ctermbg=226 cterm=NONE hi MatchParen ctermfg=16 ctermbg=220 cterm=NONE hi Search ctermfg=16 ctermbg=173 cterm=NONE hi IncSearch ctermfg=16 ctermbg=46 cterm=NONE + hi Todo ctermfg=196 ctermbg=226 cterm=NONE hi WildMenu ctermfg=235 ctermbg=186 cterm=NONE + hi Underlined ctermfg=68 ctermbg=NONE cterm=underline hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline hi SpellCap ctermfg=226 ctermbg=NONE cterm=underline hi SpellLocal ctermfg=217 ctermbg=NONE cterm=underline @@ -169,12 +169,12 @@ if s:t_Co >= 256 endif if s:t_Co >= 16 - hi Normal ctermfg=white ctermbg=black cterm=NONE - hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE - hi StatusLine ctermfg=black ctermbg=grey cterm=NONE - hi StatusLineNC ctermfg=darkgrey ctermbg=grey cterm=NONE - hi StatusLineTerm ctermfg=black ctermbg=grey cterm=NONE - hi StatusLineTermNC ctermfg=darkgrey ctermbg=grey cterm=NONE + hi Normal ctermfg=grey ctermbg=black cterm=NONE + hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold + hi StatusLine ctermfg=white ctermbg=black cterm=bold,reverse + hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE + hi StatusLineTerm ctermfg=white ctermbg=black cterm=bold,reverse + hi StatusLineTermNC ctermfg=black ctermbg=grey cterm=NONE hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE @@ -198,38 +198,38 @@ if s:t_Co >= 16 hi SignColumn ctermfg=NONE ctermbg=black cterm=NONE hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=NONE hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE - hi Underlined ctermfg=blue ctermbg=NONE cterm=underline hi Error ctermfg=darkred ctermbg=white cterm=reverse hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse hi ModeMsg ctermfg=black ctermbg=yellow cterm=NONE hi WarningMsg ctermfg=cyan ctermbg=NONE cterm=NONE hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE hi Question ctermfg=yellow ctermbg=NONE cterm=NONE - hi Todo ctermfg=darkred ctermbg=darkyellow cterm=NONE hi MatchParen ctermfg=black ctermbg=yellow cterm=NONE hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE + hi Todo ctermfg=black ctermbg=yellow cterm=NONE hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE + hi Underlined ctermfg=blue ctermbg=NONE cterm=underline hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline hi SpellLocal ctermfg=red ctermbg=NONE cterm=underline hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline - hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE - hi String ctermfg=cyan ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkred ctermbg=NONE cterm=NONE + hi Statement ctermfg=blue ctermbg=NONE cterm=bold + hi Identifier ctermfg=red ctermbg=NONE cterm=bold + hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE + hi Operator ctermfg=red ctermbg=NONE cterm=NONE + hi PreProc ctermfg=red ctermbg=NONE cterm=NONE + hi Structure ctermfg=green ctermbg=NONE cterm=NONE hi Function ctermfg=yellow ctermbg=NONE cterm=NONE + hi Type ctermfg=blue ctermbg=NONE cterm=bold + hi Define ctermfg=yellow ctermbg=NONE cterm=bold + hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Statement ctermfg=blue ctermbg=NONE cterm=bold - hi Constant ctermfg=red ctermbg=NONE cterm=NONE - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Type ctermfg=blue ctermbg=NONE cterm=bold - hi Operator ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Define ctermfg=yellow ctermbg=NONE cterm=bold - hi Structure ctermfg=darkgreen ctermbg=NONE cterm=NONE - hi Directory ctermfg=green ctermbg=NONE cterm=bold + hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE - hi Title ctermfg=yellow ctermbg=NONE cterm=bold + hi Title ctermfg=darkyellow ctermbg=NONE cterm=bold hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE hi DiffChange ctermfg=white ctermbg=blue cterm=NONE hi DiffText ctermfg=black ctermbg=grey cterm=NONE @@ -274,27 +274,28 @@ if s:t_Co >= 8 hi WarningMsg ctermfg=darkcyan ctermbg=NONE cterm=NONE hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Todo ctermfg=darkred ctermbg=darkyellow cterm=NONE hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE + hi Todo ctermfg=black ctermbg=yellow cterm=NONE hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE + hi Underlined ctermfg=blue ctermbg=NONE cterm=underline hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse - hi Comment ctermfg=grey ctermbg=NONE cterm=bold + hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold + hi Identifier ctermfg=darkred ctermbg=NONE cterm=bold + hi Comment ctermfg=darkgray ctermbg=NONE cterm=bold + hi Operator ctermfg=darkred ctermbg=NONE cterm=bold + hi PreProc ctermfg=darkred ctermbg=NONE cterm=bold + hi Structure ctermfg=darkgreen ctermbg=NONE cterm=bold + hi Function ctermfg=darkyellow ctermbg=NONE cterm=bold + hi Type ctermfg=darkblue ctermbg=NONE cterm=bold + hi Define ctermfg=darkyellow ctermbg=NONE cterm=bold + hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE - hi Identifier ctermfg=darkred ctermbg=NONE cterm=NONE - hi Function ctermfg=darkyellow ctermbg=NONE cterm=NONE hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE - hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold - hi Constant ctermfg=darkred ctermbg=NONE cterm=bold - hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Type ctermfg=darkblue ctermbg=NONE cterm=bold - hi Operator ctermfg=darkmagenta ctermbg=NONE cterm=NONE - hi Define ctermfg=darkyellow ctermbg=NONE cterm=bold - hi Structure ctermfg=darkgreen ctermbg=NONE cterm=NONE hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE @@ -376,29 +377,45 @@ if s:t_Co >= 0 endif " Background: dark -" Color: foreground #FFFFFF 231 white -" Color: background #262626 235 black -" Color: color00 #000000 16 black -" Color: color08 #333333 236 darkgrey -" Color: color01 #FF0000 196 darkred -" Color: color09 #FFAFAF 217 red -" Color: color02 #5F8700 64 darkgreen -" Color: color10 #00875F 29 green -" Color: color03 #ffff00 226 darkyellow -" Color: color11 #FFD700 220 yellow -" Color: color04 #87d7FF 117 darkblue -" Color: color12 #5F87D7 68 blue -" Color: color05 #d7d787 186 darkmagenta -" Color: color13 #AFAF87 144 magenta -" Color: color06 #FFD7AF 223 darkcyan -" Color: color14 #FF8787 210 cyan -" Color: color07 #666666 241 grey -" Color: color15 #FFFFFF 231 white -" Color: color16 #D7875F 173 darkmagenta -" Color: color17 #00FF00 46 darkgreen -" Color: Pmenu #4A4A4A 239 darkgrey -" Term colors: color00 color01 color02 color03 color04 color05 color06 color07 -" Term colors: color08 color09 color10 color11 color12 color13 color14 color15 +" Color: x_black #000000 16 black +" Color: x_darkred #cd0000 160 darkred +" Color: x_darkgreen #00cd00 40 darkgreen +" Color: x_darkyellow #cdcd00 184 darkyellow +" Color: x_darkblue #0000ee 21 darkblue +" Color: x_darkmagenta #cd00cd 164 darkmagenta +" Color: x_darkcyan #00cdcd 44 darkcyan +" Color: x_gray #e5e5e5 254 gray +" Color: x_darkgray #7f7f7f 244 darkgray +" Color: x_red #ff0000 196 red +" Color: x_green #00ff00 46 green +" Color: x_yellow #ffff00 226 yellow +" Color: x_blue #5c5cff 63 blue +" Color: x_magenta #ff00ff 201 magenta +" Color: x_cyan #00ffff 51 cyan +" Color: x_white #ffffff 231 white +" Color: foreground #FFFFFF 231 white +" Color: background #262626 235 black +" Color: color00 #000000 16 black +" Color: color08 #333333 236 darkgrey +" Color: color01 #FF0000 196 darkred +" Color: color09 #FFAFAF 217 red +" Color: color02 #5F8700 64 darkgreen +" Color: color10 #00875F 29 green +" Color: color03 #ffff00 226 darkyellow +" Color: color11 #FFD700 220 yellow +" Color: color04 #87d7FF 117 darkblue +" Color: color12 #5F87D7 68 blue +" Color: color05 #d7d787 186 darkmagenta +" Color: color13 #AFAF87 144 magenta +" Color: color06 #FFD7AF 223 darkcyan +" Color: color14 #FF8787 210 cyan +" Color: color07 #666666 241 grey +" Color: color15 #FFFFFF 231 white +" Color: color16 #D7875F 173 darkmagenta +" Color: color17 #00FF00 46 darkgreen +" Color: Pmenu #4A4A4A 239 darkgrey +" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray +" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white " Color: bgDiffA #5F875F 65 darkgreen " Color: bgDiffC #5F87AF 67 blue " Color: bgDiffD #AF5FAF 133 magenta diff --git a/runtime/colors/tools/check_colors.vim b/runtime/colors/tools/check_colors.vim --- a/runtime/colors/tools/check_colors.vim +++ b/runtime/colors/tools/check_colors.vim @@ -6,10 +6,23 @@ vim9script def Test_check_colors() const savedview = winsaveview() cursor(1, 1) - var err = {} + + # err is + # { + # colors_name: "message", + # init: "message", + # background: "message", + # ....etc + # highlight: { + # 'Normal': "Missing ...", + # 'Conceal': "Missing ..." + # ....etc + # } + # } + var err: dict = {} # 1) Check g:colors_name is existing - if !search('\<\%(g:\)\?colors_name\>', 'cnW') + if search('\<\%(g:\)\?colors_name\>', 'cnW') == 0 err['colors_name'] = 'g:colors_name not set' else err['colors_name'] = 'OK' @@ -180,11 +193,12 @@ def Test_check_colors() Result(err) enddef -def Result(err: any) + +def Result(err: dict) var do_groups: bool = v:false echohl Title | echomsg "---------------" | echohl Normal for key in sort(keys(err)) - if key is 'highlight' + if key == 'highlight' do_groups = !empty(err[key]) continue else diff --git a/runtime/colors/torte.vim b/runtime/colors/torte.vim --- a/runtime/colors/torte.vim +++ b/runtime/colors/torte.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Thorsten Maerz " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:15 +" Last Updated: Mon Aug 8 15:21:22 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'torte' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff'] diff --git a/runtime/colors/zellner.vim b/runtime/colors/zellner.vim --- a/runtime/colors/zellner.vim +++ b/runtime/colors/zellner.vim @@ -4,7 +4,7 @@ " Maintainer: Original maintainer Ron Aaron " Website: https://github.com/vim/colorschemes " License: Same as Vim -" Last Updated: 2022-07-26 15:50:16 +" Last Updated: Mon Aug 8 15:21:23 2022 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=light hi clear let g:colors_name = 'zellner' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 +let s:t_Co = exists('&t_Co') ? (&t_Co ?? 0) : -1 if (has('termguicolors') && &termguicolors) || has('gui_running') let g:terminal_ansi_colors = ['#ffffff', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#a9a9a9', '#ff0000', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#000000'] diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -4399,8 +4399,11 @@ has({feature} [, {check}]) has_key({dict}, {key}) *has_key()* The result is a Number, which is TRUE if |Dictionary| {dict} - has an entry with key {key}. FALSE otherwise. The {key} - argument is a string. + has an entry with key {key}. FALSE otherwise. + The {key} argument is a string. In |Vim9| script a number is + also accepted (and converted to a string) but no other types. + In legacy script the usual automatic conversion to string is + done. Can also be used as a |method|: > mydict->has_key(key) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -799,7 +799,8 @@ A jump table for the options with a shor When on, Vim will change the current working directory whenever you open a file, switch buffers, delete a buffer or open/close a window. It will change to the directory containing the file which was opened - or selected. + or selected. When a buffer has no name it also has no directory, thus + the current directory won't change when navigating to it. Note: When this option is on some plugins may not work. *'autoshelldir'* *'asd'* *'noautoshelldir'* *'noasd'* diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -4905,6 +4905,7 @@ Before the color scheme will be loaded a autocommand event is triggered. After the color scheme has been loaded the |ColorScheme| autocommand event is triggered. + *colorscheme-override* If a color scheme is almost right, you can add modifications on top of it by using the |ColorScheme| autocommand. For example, to remove the background color (can make it transparent in some terminals): > diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -6229,6 +6229,7 @@ collate-variable eval.txt /*collate-vari color-schemes syntax.txt /*color-schemes* color-xterm syntax.txt /*color-xterm* coloring syntax.txt /*coloring* +colorscheme-override syntax.txt /*colorscheme-override* colortest.vim syntax.txt /*colortest.vim* command-attributes map.txt /*command-attributes* command-block vim9.txt /*command-block* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -41,8 +41,6 @@ browser use: https://github.com/vim/vim/ Text props: Add "padding" argument - only for when using "text" and {col} is zero. Use tp_len field and n_attr_skip. #10906 -Graduate FEAT_TEXTOBJ ? - Further Vim9 improvements, possibly after launch: - Use Vim9 for more runtime files. - Check performance with callgrind and kcachegrind. diff --git a/runtime/ftplugin/j.vim b/runtime/ftplugin/j.vim --- a/runtime/ftplugin/j.vim +++ b/runtime/ftplugin/j.vim @@ -2,7 +2,7 @@ " Language: J " Maintainer: David Bürgin " URL: https://gitlab.com/glts/vim-j -" Last Change: 2015-10-27 +" Last Change: 2022-08-06 if exists('b:did_ftplugin') finish @@ -29,41 +29,43 @@ let b:undo_ftplugin = 'setlocal suffixes " Section movement with ]] ][ [[ []. The start/end patterns below are amended " inside the function in order to avoid matching on the current cursor line. -let s:sectionstart = '\%(\s*Note\|.\{-}\<\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\)\>.*' -let s:sectionend = '\s*)\s*' +if !exists('no_plugin_maps') && !exists('no_j_maps') + let s:sectionstart = '\%(\s*Note\|.\{-}\<\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\)\>.*' + let s:sectionend = '\s*)\s*' -function! s:SearchSection(end, backwards, visualmode) abort - if a:visualmode !=# '' - normal! gv - endif - let l:flags = a:backwards ? 'bsW' : 'sW' - if a:end - call search('^' . s:sectionend . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags) - else - call search('^' . s:sectionstart . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags) - endif -endfunction + function! s:SearchSection(end, backwards, visualmode) abort + if a:visualmode !=# '' + normal! gv + endif + let l:flags = a:backwards ? 'bsW' : 'sW' + if a:end + call search('^' . s:sectionend . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags) + else + call search('^' . s:sectionstart . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags) + endif + endfunction -noremap ]] :call SearchSection(0, 0, '') -xnoremap ]] :call SearchSection(0, 0, visualmode()) -sunmap ]] -noremap ][ :call SearchSection(1, 0, '') -xnoremap ][ :call SearchSection(1, 0, visualmode()) -sunmap ][ -noremap [[ :call SearchSection(0, 1, '') -xnoremap [[ :call SearchSection(0, 1, visualmode()) -sunmap [[ -noremap [] :call SearchSection(1, 1, '') -xnoremap [] :call SearchSection(1, 1, visualmode()) -sunmap [] + noremap ]] :call SearchSection(0, 0, '') + xnoremap ]] :call SearchSection(0, 0, visualmode()) + sunmap ]] + noremap ][ :call SearchSection(1, 0, '') + xnoremap ][ :call SearchSection(1, 0, visualmode()) + sunmap ][ + noremap [[ :call SearchSection(0, 1, '') + xnoremap [[ :call SearchSection(0, 1, visualmode()) + sunmap [[ + noremap [] :call SearchSection(1, 1, '') + xnoremap [] :call SearchSection(1, 1, visualmode()) + sunmap [] -let b:undo_ftplugin .= ' | silent! execute "unmap ]]"' - \ . ' | silent! execute "unmap ]["' - \ . ' | silent! execute "unmap [["' - \ . ' | silent! execute "unmap []"' + let b:undo_ftplugin .= ' | silent! execute "unmap ]]"' + \ . ' | silent! execute "unmap ]["' + \ . ' | silent! execute "unmap [["' + \ . ' | silent! execute "unmap []"' +endif -" Browse dialog filter on Windows (see ":help browsefilter") -if has('gui_win32') && !exists('b:browsefilter') +" Browse dialog filter on Windows and GTK (see ":help browsefilter") +if (has('gui_win32') || has('gui_gtk')) && !exists('b:browsefilter') let b:browsefilter = "J Script Files (*.ijs)\t*.ijs\n" \ . "All Files (*.*)\t*.*\n" let b:undo_ftplugin .= ' | unlet! b:browsefilter' diff --git a/runtime/indent/testdir/html.in b/runtime/indent/testdir/html.in --- a/runtime/indent/testdir/html.in +++ b/runtime/indent/testdir/html.in @@ -1,7 +1,7 @@ -" vim: set ft=html sw=4 ts=8 : +% vim: set ft=html sw=4 ts=8 : -" START_INDENT +% START_INDENT