# HG changeset patch # User Bram Moolenaar # Date 1659363304 -7200 # Node ID e64e9ba15accfffd936055bd5c3af83022b46727 # Parent a0de845ba469fd435c41b76edf340d241a0410ab Update runtime files Commit: https://github.com/vim/vim/commit/05a8061eecd9969ee6cde008f54ded77462b649e Author: Bram Moolenaar Date: Mon Aug 1 15:09:53 2022 +0100 Update runtime files diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -107,6 +107,7 @@ runtime/ftplugin/cs.vim @nickspoons runtime/ftplugin/csh.vim @dkearns runtime/ftplugin/css.vim @dkearns runtime/ftplugin/cucumber.vim @tpope +runtime/ftplugin/desktop.vim @e-kwsm runtime/ftplugin/dosbatch.vim @mrdubya runtime/ftplugin/eiffel.vim @dkearns runtime/ftplugin/expect.vim @dkearns @@ -173,6 +174,7 @@ runtime/ftplugin/scss.vim @tpope runtime/ftplugin/sdoc.vim @gpanders runtime/ftplugin/solution.vim @dkearns runtime/ftplugin/spec.vim @ignatenkobrain +runtime/ftplugin/swayconfig.vim @jamespeapen runtime/ftplugin/systemverilog.vim @Kocha runtime/ftplugin/tap.vim @petdance runtime/ftplugin/tcsh.vim @dkearns @@ -394,6 +396,7 @@ runtime/syntax/sshconfig.vim @Jakuje runtime/syntax/sshdconfig.vim @Jakuje runtime/syntax/sudoers.vim @e-kwsm runtime/syntax/svn.vim @hdima +runtime/syntax/swayconfig.vim @jamespeapen runtime/syntax/systemverilog.vim @Kocha runtime/syntax/tags.vim @cecamp runtime/syntax/tap.vim @petdance 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: Sat 11 Jun 2022 11:16:14 MSK +" Last Updated: 2022-07-26 15:49:58 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'blue' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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'] 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: Sat 11 Jun 2022 14:37:41 MSK +" Last Updated: 2022-07-26 15:49:59 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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: Sun Jun 12 10:50:30 2022 +" Last Updated: 2022-07-26 15:50:00 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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: Sun Jun 12 10:51:36 2022 +" Last Updated: 2022-07-26 15:50:01 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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'] @@ -40,7 +40,7 @@ hi TabLineFill guifg=NONE guibg=#c2bfa5 hi TabLineSel guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE hi ToolbarLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE hi ToolbarButton guifg=#333333 guibg=#ffde9b gui=bold cterm=bold -hi NonText guifg=#6dceeb guibg=NONE gui=NONE cterm=NONE +hi NonText guifg=#6dceeb guibg=#4d4d4d gui=NONE cterm=NONE hi SpecialKey guifg=#9acd32 guibg=NONE gui=NONE cterm=NONE hi Folded guifg=#eeee00 guibg=#4d4d4d gui=NONE cterm=NONE hi Visual guifg=#f0e68c guibg=#6b8e24 gui=NONE cterm=NONE @@ -112,7 +112,7 @@ if s:t_Co >= 256 hi TabLineSel ctermfg=236 ctermbg=186 cterm=NONE hi ToolbarLine ctermfg=NONE ctermbg=241 cterm=NONE hi ToolbarButton ctermfg=236 ctermbg=222 cterm=bold - hi NonText ctermfg=81 ctermbg=NONE cterm=NONE + hi NonText ctermfg=81 ctermbg=239 cterm=NONE hi SpecialKey ctermfg=112 ctermbg=NONE cterm=NONE hi Folded ctermfg=226 ctermbg=239 cterm=NONE hi Visual ctermfg=186 ctermbg=64 cterm=NONE 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: Sun Jun 12 10:48:00 2022 +" Last Updated: 2022-07-26 15:50:02 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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: Sun Jun 12 10:52:56 2022 +" Last Updated: 2022-07-26 15:50:03 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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 new file mode 100644 --- /dev/null +++ b/runtime/colors/habamax.vim @@ -0,0 +1,519 @@ +" Name: habamax +" Description: Hubba hubba hubba. +" Author: Maxim Kim +" Maintainer: Maxim Kim +" Website: https://github.com/vim/colorschemes +" License: Same as Vim +" Last Updated: 2022-07-26 15:50:04 + +" Generated by Colortemplate v2.2.0 + +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 + +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'] +endif +hi! link Terminal Normal +hi! link StatuslineTerm Statusline +hi! link StatuslineTermNC StatuslineNC +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 vimVar Normal +hi! link vimOper Normal +hi! link vimSep Normal +hi! link vimParenSep Normal +hi! link vimCommentString Comment +hi! link gitCommitSummary Title +hi! link markdownUrl String +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 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 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 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 +hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE +hi TabLine guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE +hi TabLineFill guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE +hi TabLineSel guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold +hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE +hi ToolbarButton guifg=#9e9e9e guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse +hi QuickFixLine guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE +hi CursorLineNr guifg=#ffaf5f guibg=NONE gui=bold cterm=bold +hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE +hi LineNrAbove guifg=#585858 guibg=NONE gui=NONE cterm=NONE +hi LineNrBelow guifg=#585858 guibg=NONE gui=NONE cterm=NONE +hi NonText 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 FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE +hi Visual guifg=#1c1c1c guibg=#87afaf gui=NONE cterm=NONE +hi VisualNOS guifg=#1c1c1c guibg=#5f8787 gui=NONE cterm=NONE +hi Pmenu guifg=NONE guibg=#262626 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 PmenuSel guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE +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 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 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 debugPC guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE +hi debugBreakpoint guifg=#1c1c1c guibg=#df875f 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 +hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE +hi Folded guifg=#9e9e9e guibg=#262626 gui=NONE cterm=NONE +hi ColorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE +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 Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE +hi Constant guifg=#df875f 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 +hi Statement guifg=#af87af guibg=NONE gui=NONE cterm=NONE +hi PreProc guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE +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 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 +hi Debug guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE +hi DiffAdd guifg=#000000 guibg=#87af87 gui=NONE cterm=NONE +hi DiffDelete guifg=#af875f guibg=NONE gui=NONE cterm=NONE +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 DiffChange guifg=#000000 guibg=#afafaf gui=NONE cterm=NONE + +if s:t_Co >= 256 + hi! link Terminal Normal + hi! link StatuslineTerm Statusline + hi! link StatuslineTermNC StatuslineNC + 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 vimVar Normal + hi! link vimOper Normal + hi! link vimSep Normal + hi! link vimParenSep Normal + hi! link vimCommentString Comment + hi! link gitCommitSummary Title + hi! link markdownUrl String + 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 elixirAtom PreProc + hi! link elixirDocTest String + hi ALEErrorSign ctermfg=167 ctermbg=NONE cterm=NONE + hi ALEInfoSign ctermfg=186 ctermbg=NONE cterm=NONE + hi ALEWarningSign ctermfg=139 ctermbg=NONE cterm=NONE + hi ALEError ctermfg=234 ctermbg=167 cterm=NONE + hi ALEVirtualTextError ctermfg=234 ctermbg=167 cterm=NONE + hi ALEWarning ctermfg=234 ctermbg=139 cterm=NONE + hi ALEVirtualTextWarning ctermfg=234 ctermbg=139 cterm=NONE + hi ALEInfo ctermfg=186 ctermbg=NONE cterm=NONE + hi ALEVirtualTextInfo ctermfg=186 ctermbg=NONE cterm=NONE + hi Normal ctermfg=250 ctermbg=234 cterm=NONE + hi Statusline ctermfg=234 ctermbg=247 cterm=NONE + hi StatuslineNC ctermfg=234 ctermbg=243 cterm=NONE + hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE + hi TabLine ctermfg=234 ctermbg=243 cterm=NONE + hi TabLineFill ctermfg=234 ctermbg=243 cterm=NONE + hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=247 ctermbg=234 cterm=bold,reverse + hi QuickFixLine ctermfg=234 ctermbg=67 cterm=NONE + hi CursorLineNr ctermfg=215 ctermbg=NONE cterm=bold + hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE + hi LineNrAbove ctermfg=240 ctermbg=NONE cterm=NONE + hi LineNrBelow ctermfg=240 ctermbg=NONE cterm=NONE + hi NonText ctermfg=240 ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE + hi Visual ctermfg=234 ctermbg=109 cterm=NONE + hi VisualNOS ctermfg=234 ctermbg=66 cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=235 cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=234 ctermbg=144 cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=167 ctermbg=234 cterm=reverse + hi ErrorMsg ctermfg=167 ctermbg=234 cterm=reverse + hi ModeMsg ctermfg=234 ctermbg=186 cterm=NONE + hi MoreMsg ctermfg=108 ctermbg=NONE cterm=NONE + hi Question ctermfg=144 ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=173 ctermbg=NONE cterm=NONE + hi Todo ctermfg=186 ctermbg=234 cterm=reverse + hi MatchParen ctermfg=66 ctermbg=234 cterm=reverse + hi Search ctermfg=234 ctermbg=108 cterm=NONE + hi IncSearch ctermfg=234 ctermbg=215 cterm=NONE + hi CurSearch ctermfg=234 ctermbg=144 cterm=NONE + hi WildMenu ctermfg=234 ctermbg=186 cterm=NONE + hi debugPC ctermfg=234 ctermbg=67 cterm=NONE + hi debugBreakpoint ctermfg=234 ctermbg=173 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE + hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE + hi Folded ctermfg=247 ctermbg=235 cterm=NONE + hi ColorColumn ctermfg=NONE ctermbg=235 cterm=NONE + hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline + hi SpellCap ctermfg=67 ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=108 ctermbg=NONE cterm=underline + hi SpellRare ctermfg=182 ctermbg=NONE cterm=underline + hi Comment ctermfg=243 ctermbg=NONE cterm=NONE + hi Constant ctermfg=173 ctermbg=NONE cterm=NONE + hi String ctermfg=108 ctermbg=NONE cterm=NONE + hi Character ctermfg=151 ctermbg=NONE cterm=NONE + hi Identifier ctermfg=109 ctermbg=NONE cterm=NONE + hi Statement ctermfg=139 ctermbg=NONE cterm=NONE + hi PreProc ctermfg=144 ctermbg=NONE cterm=NONE + hi Type ctermfg=110 ctermbg=NONE cterm=NONE + hi Special ctermfg=66 ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi Title ctermfg=186 ctermbg=NONE cterm=bold + hi Directory ctermfg=109 ctermbg=NONE cterm=bold + hi Conceal ctermfg=243 ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi Debug ctermfg=66 ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=16 ctermbg=108 cterm=NONE + hi DiffDelete ctermfg=137 ctermbg=NONE cterm=NONE + 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 DiffChange ctermfg=16 ctermbg=145 cterm=NONE + unlet s:t_Co + finish +endif + +if s:t_Co >= 16 + hi ALEErrorSign ctermfg=darkred ctermbg=NONE cterm=NONE + hi ALEInfoSign ctermfg=yellow ctermbg=NONE cterm=NONE + hi ALEWarningSign ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi ALEError ctermfg=black ctermbg=darkred cterm=NONE + hi ALEVirtualTextError ctermfg=black ctermbg=darkred cterm=NONE + hi ALEWarning ctermfg=black ctermbg=darkmagenta cterm=NONE + hi ALEVirtualTextWarning ctermfg=black ctermbg=darkmagenta cterm=NONE + hi ALEInfo ctermfg=yellow ctermbg=NONE cterm=NONE + hi ALEVirtualTextInfo ctermfg=yellow ctermbg=NONE cterm=NONE + hi Normal ctermfg=white ctermbg=black cterm=NONE + hi Statusline ctermfg=black ctermbg=gray cterm=NONE + hi StatuslineNC ctermfg=black ctermbg=darkgray cterm=NONE + hi VertSplit ctermfg=darkgray ctermbg=darkgray cterm=NONE + hi TabLine ctermfg=black ctermbg=darkgray cterm=NONE + hi TabLineFill ctermfg=black ctermbg=darkgray cterm=NONE + hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse + hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE + hi CursorLineNr ctermfg=red ctermbg=NONE cterm=bold + hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi LineNrAbove ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi LineNrBelow ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Visual ctermfg=black ctermbg=cyan cterm=NONE + hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=darkgray cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=black cterm=reverse + hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse + hi ModeMsg ctermfg=black ctermbg=yellow cterm=NONE + hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE + hi Todo ctermfg=yellow ctermbg=black cterm=reverse + hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse + hi Search ctermfg=black ctermbg=darkgreen cterm=NONE + hi IncSearch ctermfg=black ctermbg=red cterm=NONE + hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE + hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE + hi debugPC ctermfg=black ctermbg=blue cterm=NONE + hi debugBreakpoint ctermfg=black ctermbg=red 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=underline + hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline + hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline + hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE + hi Constant ctermfg=red ctermbg=NONE cterm=NONE + hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Character ctermfg=green ctermbg=NONE cterm=NONE + hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE + hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi Type ctermfg=blue ctermbg=NONE cterm=NONE + hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi Title ctermfg=yellow ctermbg=NONE cterm=bold + hi Directory ctermfg=cyan ctermbg=NONE cterm=bold + hi Conceal ctermfg=darkgray ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE + hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE + hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi DiffText ctermfg=black ctermbg=lightgrey cterm=NONE + hi DiffChange ctermfg=black ctermbg=darkgray cterm=NONE + unlet s:t_Co + finish +endif + +if s:t_Co >= 8 + hi Normal ctermfg=gray ctermbg=black cterm=NONE + hi Statusline ctermfg=gray ctermbg=black cterm=bold,reverse + hi StatuslineNC ctermfg=gray ctermbg=black cterm=reverse + hi VertSplit ctermfg=gray ctermbg=black cterm=reverse + hi TabLine ctermfg=black ctermbg=gray cterm=NONE + hi TabLineFill ctermfg=black ctermbg=gray cterm=NONE + hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse + hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE + hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold + hi LineNr ctermfg=gray ctermbg=NONE cterm=bold + hi LineNrAbove ctermfg=gray ctermbg=NONE cterm=bold + hi LineNrBelow ctermfg=gray ctermbg=NONE cterm=bold + hi NonText ctermfg=gray ctermbg=NONE cterm=bold + hi EndOfBuffer ctermfg=gray ctermbg=NONE cterm=bold + hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold + hi FoldColumn ctermfg=gray ctermbg=NONE cterm=bold + hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse + hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=reverse + hi Pmenu ctermfg=black ctermbg=gray cterm=NONE + hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse + hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse + hi ModeMsg ctermfg=black ctermbg=darkyellow cterm=NONE + hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE + hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse + hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse + hi Search ctermfg=black ctermbg=darkgreen cterm=NONE + hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE + hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE + hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE + hi debugPC ctermfg=black ctermbg=blue cterm=NONE + hi debugBreakpoint 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=gray cterm=reverse + hi SpellCap ctermfg=blue ctermbg=gray cterm=reverse + hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse + hi SpellRare ctermfg=darkmagenta ctermbg=gray cterm=reverse + hi Comment ctermfg=gray ctermbg=NONE cterm=bold + hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE + hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi Type ctermfg=blue ctermbg=NONE cterm=NONE + hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi Title ctermfg=darkyellow ctermbg=NONE cterm=bold + hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold + hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE + hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE + hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE + hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi DiffText ctermfg=white ctermbg=black cterm=bold,reverse + hi DiffChange ctermfg=black ctermbg=white cterm=NONE + 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: dark +" Color: color00 #1C1C1C 234 black +" Color: color08 #767676 243 darkgray +" Color: color01 #D75F5F 167 darkred +" Color: color09 #DF875F 173 red +" Color: color02 #87AF87 108 darkgreen +" Color: color10 #AFD7AF 151 green +" Color: color03 #AFAF87 144 darkyellow +" Color: color11 #DFDF87 186 yellow +" Color: color04 #5F87AF 67 blue +" Color: color12 #87AFD7 110 blue +" Color: color05 #AF87AF 139 darkmagenta +" Color: color13 #DFAFDF 182 magenta +" Color: color06 #5F8787 66 darkcyan +" Color: color14 #87AFAF 109 cyan +" Color: color07 #9E9E9E 247 gray +" Color: color15 #BCBCBC 250 white +" Color: colorLine #303030 236 darkgrey +" Color: colorB #262626 235 darkgrey +" Color: colorNonT #585858 240 darkgrey +" Color: colorC #FFAF5F 215 red +" Color: colorlC #5FFF00 ~ +" 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: black #000000 16 black +" Color: white #FFFFFF 231 white +" Term colors: color00 color01 color02 color03 color04 color05 color06 color07 +" Term colors: color08 color09 color10 color11 color12 color13 color14 color15 +" vim: et ts=2 sw=2 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: Sun Jun 12 10:53:58 2022 +" Last Updated: 2022-07-26 15:50:05 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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: Sat 11 Jun 2022 11:24:58 MSK +" Last Updated: 2022-07-26 15:50:06 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1 hi! link Terminal Normal hi! link Boolean Constant 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: Sun Jun 12 10:55:30 2022 +" Last Updated: 2022-07-26 15:50:07 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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: Sun Jun 12 10:56:21 2022 +" Last Updated: 2022-07-26 15:50:08 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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: Sun Jun 12 10:57:11 2022 +" Last Updated: 2022-07-26 15:50:09 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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: Sun Jun 12 10:58:17 2022 +" Last Updated: 2022-07-26 15:50:10 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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 new file mode 100644 --- /dev/null +++ b/runtime/colors/quiet.vim @@ -0,0 +1,707 @@ +" Name: quiet +" Description: `monochrome`, but less ugly, with diffs, searches, a few other niceties, and both light and dark versions. +" Author: neutaaaaan +" Maintainer: neutaaaaan +" Website: https://github.com/vim/colorschemes +" License: Vim License (see `:help license`)` +" Last Updated: 2022-08-01 15:13:21 + +" 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 + +hi! link StatusLineTerm StatusLine +hi! link StatusLineTermNC StatusLineNC +hi! link Boolean Constant +hi! link Character Constant +hi! link Conditional Statement +hi! link Define PreProc +hi! link Debug Special +hi! link Delimiter Special +hi! link Exception Statement +hi! link Float Constant +hi! link Function Identifier +hi! link Include PreProc +hi! link Keyword Statement +hi! link Label Statement +hi! link Macro PreProc +hi! link Number Constant +hi! link Operator Statement +hi! link PreCondit PreProc +hi! link Repeat Statement +hi! link SpecialChar Special +hi! link SpecialComment Special +hi! link StorageClass Type +hi! link String Constant +hi! link Structure Type +hi! link Tag Special +hi! link Typedef Type +hi! link lCursor Cursor +hi! link debugBreakpoint ModeMsg +hi! link debugPC CursorLine + +if &background ==# 'dark' + if (has('termguicolors') && &termguicolors) || has('gui_running') + 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 + hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE + hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE + hi CursorLineNr guifg=#dadada guibg=#303030 gui=NONE cterm=NONE + hi DiffAdd guifg=#00af00 guibg=#080808 gui=reverse cterm=reverse + hi DiffChange guifg=#87afd7 guibg=#080808 gui=reverse cterm=reverse + hi DiffDelete guifg=#d75f5f guibg=#080808 gui=reverse cterm=reverse + hi DiffText guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse + 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 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 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 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 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 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 WildMenu guifg=#00afff guibg=#080808 gui=bold cterm=bold + hi Comment guifg=#707070 guibg=#080808 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 + hi Ignore guifg=#dadada guibg=NONE gui=NONE cterm=NONE + hi PreProc guifg=#dadada guibg=NONE gui=NONE cterm=NONE + hi Special guifg=#dadada guibg=NONE gui=NONE cterm=NONE + hi Statement guifg=#dadada guibg=NONE gui=NONE cterm=NONE + hi Todo guifg=#00ffaf guibg=NONE gui=bold,reverse cterm=bold,reverse + hi Type guifg=#dadada guibg=NONE gui=NONE cterm=NONE + hi Underlined guifg=#dadada guibg=NONE gui=underline cterm=underline + hi CursorIM guifg=#080808 guibg=#afff00 gui=NONE cterm=NONE + hi ToolbarLine guifg=NONE guibg=#080808 gui=NONE cterm=NONE + hi ToolbarButton guifg=#dadada guibg=#080808 gui=bold cterm=bold +else + " Light background + if (has('termguicolors') && &termguicolors) || has('gui_running') + 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 + hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE + hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE + hi CursorLineNr guifg=#080808 guibg=#eeeeee gui=NONE cterm=NONE + hi DiffAdd guifg=#87d787 guibg=#080808 gui=reverse cterm=reverse + 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 ErrorMsg guifg=#080808 guibg=#d7d7d7 gui=reverse cterm=reverse + hi FoldColumn guifg=#626262 guibg=#d7d7d7 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 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 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 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 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 + hi SpellRare guifg=#008787 guibg=#d7d7d7 guisp=#008787 gui=undercurl cterm=underline + hi StatusLine guifg=#eeeeee guibg=#080808 gui=bold cterm=bold + hi StatusLineNC guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE + 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 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 WildMenu guifg=#080808 guibg=#eeeeee gui=bold cterm=bold + hi Comment guifg=#080808 guibg=#d7d7d7 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 + hi Ignore guifg=#080808 guibg=NONE gui=NONE cterm=NONE + hi PreProc guifg=#080808 guibg=NONE gui=NONE cterm=NONE + hi Special guifg=#080808 guibg=NONE gui=NONE cterm=NONE + hi Statement guifg=#080808 guibg=NONE gui=NONE cterm=NONE + hi Todo guifg=#00ffaf guibg=#080808 gui=bold,reverse cterm=bold,reverse + hi Type guifg=#080808 guibg=NONE gui=NONE cterm=NONE + hi Underlined guifg=#080808 guibg=NONE gui=underline cterm=underline + hi CursorIM guifg=#080808 guibg=#afff00 gui=NONE cterm=NONE + hi ToolbarLine guifg=NONE guibg=#d7d7d7 gui=NONE cterm=NONE + hi ToolbarButton guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold +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 + hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE + hi CursorLineNr ctermfg=253 ctermbg=236 cterm=NONE + hi DiffAdd ctermfg=34 ctermbg=232 cterm=reverse + hi DiffChange ctermfg=110 ctermbg=232 cterm=reverse + hi DiffDelete ctermfg=167 ctermbg=232 cterm=reverse + hi DiffText ctermfg=176 ctermbg=232 cterm=reverse + 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 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 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 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 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 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 WildMenu ctermfg=39 ctermbg=232 cterm=bold + hi Comment ctermfg=242 ctermbg=232 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 + hi Ignore ctermfg=253 ctermbg=NONE cterm=NONE + hi PreProc ctermfg=253 ctermbg=NONE cterm=NONE + hi Special ctermfg=253 ctermbg=NONE cterm=NONE + hi Statement ctermfg=253 ctermbg=NONE cterm=NONE + hi Todo ctermfg=49 ctermbg=NONE cterm=bold,reverse + hi Type ctermfg=253 ctermbg=NONE cterm=NONE + hi Underlined ctermfg=253 ctermbg=NONE cterm=underline + hi CursorIM ctermfg=232 ctermbg=154 cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=232 cterm=NONE + hi ToolbarButton ctermfg=253 ctermbg=232 cterm=bold + 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 + hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE + hi CursorLineNr ctermfg=232 ctermbg=255 cterm=NONE + hi DiffAdd ctermfg=114 ctermbg=232 cterm=reverse + 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 ErrorMsg ctermfg=232 ctermbg=188 cterm=reverse + hi FoldColumn ctermfg=241 ctermbg=188 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 MatchParen ctermfg=199 ctermbg=188 cterm=bold + hi ModeMsg ctermfg=232 ctermbg=188 cterm=bold + hi MoreMsg ctermfg=232 ctermbg=188 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 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 SpellBad ctermfg=124 ctermbg=188 cterm=underline + hi SpellCap ctermfg=25 ctermbg=188 cterm=underline + hi SpellLocal ctermfg=90 ctermbg=188 cterm=underline + hi SpellRare ctermfg=30 ctermbg=188 cterm=underline + hi StatusLine ctermfg=255 ctermbg=232 cterm=bold + hi StatusLineNC ctermfg=232 ctermbg=248 cterm=NONE + 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 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 WildMenu ctermfg=232 ctermbg=255 cterm=bold + hi Comment ctermfg=232 ctermbg=188 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 + hi Ignore ctermfg=232 ctermbg=NONE cterm=NONE + hi PreProc ctermfg=232 ctermbg=NONE cterm=NONE + hi Special ctermfg=232 ctermbg=NONE cterm=NONE + hi Statement ctermfg=232 ctermbg=NONE cterm=NONE + hi Todo ctermfg=49 ctermbg=232 cterm=bold,reverse + hi Type ctermfg=232 ctermbg=NONE cterm=NONE + hi Underlined ctermfg=232 ctermbg=NONE cterm=underline + hi CursorIM ctermfg=232 ctermbg=154 cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=188 cterm=NONE + hi ToolbarButton ctermfg=232 ctermbg=188 cterm=bold + endif + unlet s:t_Co + finish +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 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 LineNr ctermfg=NONE ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline + hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE + hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse + 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 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 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 + hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE + hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Title ctermfg=NONE ctermbg=NONE cterm=NONE + hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE + hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse + hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout + hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold + hi Comment ctermfg=NONE ctermbg=NONE cterm=bold + hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Type ctermfg=NONE ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse + hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + 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 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 LineNr ctermfg=NONE ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline + hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE + hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse + 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 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 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 + hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE + hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Title ctermfg=NONE ctermbg=NONE cterm=NONE + hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE + hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse + hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout + hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold + hi Comment ctermfg=NONE ctermbg=NONE cterm=bold + hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Type ctermfg=NONE ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse + hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + endif + unlet s:t_Co + finish +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 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 LineNr ctermfg=NONE ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline + hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE + hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse + 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 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 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 + hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE + hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Title ctermfg=NONE ctermbg=NONE cterm=NONE + hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE + hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse + hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout + hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold + hi Comment ctermfg=NONE ctermbg=NONE cterm=bold + hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Type ctermfg=NONE ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse + hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + 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 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 LineNr ctermfg=NONE ctermbg=NONE cterm=NONE + hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline + hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE + hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE + hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse + 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 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 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 + hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE + hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Title ctermfg=NONE ctermbg=NONE cterm=NONE + hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE + hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse + hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE + hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout + hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold + hi Comment ctermfg=NONE ctermbg=NONE cterm=bold + hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE + hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE + hi Special ctermfg=NONE ctermbg=NONE cterm=NONE + hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE + hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse + hi Type ctermfg=NONE ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse + hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse + 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: 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 ~ +" 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 ~ +" Term colors: light0 light1 light2 light3 light4 light5 light6 light7 +" Term colors: light8 light9 light10 light11 light12 light13 light14 light15 +" Background: any +" vim: et ts=2 sw=2 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: Sat 11 Jun 2022 11:29:07 MSK +" Last Updated: 2022-07-26 15:50:11 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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: Sun Jun 12 11:02:11 2022 +" Last Updated: 2022-07-26 15:50:12 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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: Sun Jun 12 11:03:10 2022 +" Last Updated: 2022-07-26 15:50:14 " Generated by Colortemplate v2.2.0 @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'slate' -let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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'] 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: Sun Jun 12 11:04:48 2022 +" Last Updated: 2022-07-26 15:50:15 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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: Sun Jun 12 11:05:43 2022 +" Last Updated: 2022-07-26 15:50:16 " 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 > 1 ? &t_Co : 1 +let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -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/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1549,7 +1549,7 @@ to be doubled. These two commands are e if a =~ '\s*' -interpolated-string *$quote* *interp-string* *E256* +interpolated-string *$quote* *interp-string* -------------------- $"string" interpolated string constant *expr-$quote* $'string' interpolated literal string constant *expr-$'* diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -2103,7 +2103,6 @@ 90.5 usr_90.txt /*90.5* :XMLent insert.txt /*:XMLent* :XMLns insert.txt /*:XMLns* :[range] motion.txt /*:[range]* -:[vV\x16] autocmd.txt /*:[vV\\x16]* :\bar cmdline.txt /*:\\bar* :_! cmdline.txt /*:_!* :_# cmdline.txt /*:_#* @@ -4437,7 +4436,6 @@ E252 options.txt /*E252* E253 mbyte.txt /*E253* E254 message.txt /*E254* E255 sign.txt /*E255* -E256 eval.txt /*E256* E257 if_cscop.txt /*E257* E258 remote.txt /*E258* E259 if_cscop.txt /*E259* @@ -5060,7 +5058,6 @@ E835 options.txt /*E835* E836 if_pyth.txt /*E836* E837 if_pyth.txt /*E837* E838 netbeans.txt /*E838* -E839 vim9.txt /*E839* E84 windows.txt /*E84* E840 insert.txt /*E840* E841 map.txt /*E841* @@ -10226,15 +10223,12 @@ try-finally eval.txt /*try-finally* try-nested eval.txt /*try-nested* try-nesting eval.txt /*try-nesting* tutor usr_01.txt /*tutor* -twice if_cscop.txt /*twice* two-engines pattern.txt /*two-engines* type() builtin.txt /*type()* type-casting vim9.txt /*type-casting* type-checking vim9.txt /*type-checking* type-inference vim9.txt /*type-inference* type-mistakes tips.txt /*type-mistakes* -typecorrect-settings usr_51.txt /*typecorrect-settings* -typecorrect.txt usr_51.txt /*typecorrect.txt* typename() builtin.txt /*typename()* u undo.txt /*u* uganda uganda.txt /*uganda* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -38,23 +38,17 @@ browser use: https://github.com/vim/vim/ *known-bugs* -------------------- Known bugs and current work ----------------------- -PR to consider: -- stricter parsing for has('patch-x.y.z') #10752 -- cmdheight=0 #10675 Does it work properly? -- add splitscroll #10682 Useful? Any trouble? Null Chilly says it's OK. - suggestion: names instead of numbers for the option value - problem depending on whether window is focused or not - Support virtual text: #7553 -- Remove and free text when textprop is removed with negative ID. -- "gj" does not work correctly -- no virtual text when 'signcolumn' is set to "yes" #10794 -- placement at the end of the line: after the text (text_align: "end"), right - aligned (text_align: "right"); choice: truncate when not enough space or - wrap to next line (text_wrap: "yes"); Also: fill with space to text wraps to - start of next screen line (text_align: "below") - Also consider an empty line, should fix #10786. Also check inserting text. +- Wrong cursor position in Insert mode, wrong pos after typing char #10786 +- implement "text_align" - right + when not truncated, may increase line height +- implement "text_align" - below + need to compute extra screen line +- implement "text_wrap" - truncate +- when Tab is in text handle it like a space +- Also consider an empty line, should fix #10786. Also check inserting text. - win_lbr_chartabsize() TODO item: count screen cells +- check that when inserting/deleting text col == MAXCOL isn't changed - wrong cursor position (Yegappan, July 27) - many tests @@ -222,9 +216,14 @@ Terminal emulator window: conversions. Patches considered for including: +- use int instead of char_ for index #10818 needs a test - Add "-n" option to xxd. #10599 needs a test - allow for nesting of timeout, sketch in #10595 +Add 'splitscroll' #10682 Useful? Any trouble? Null Chilly says it's OK. + suggestion: names instead of numbers for the option value + problem depending on whether window is focused or not + Autoconf: must use autoconf 2.69, later version generates lots of warnings - try using autoconf 2.71 and fix all "obsolete" warnings @@ -247,6 +246,9 @@ pass it on with modifications. Using "A" and "o" in manually created fold (in empty buffer) does not behave consistenly (James McCoy, #10698) +To avoid flicker: add an option that when a screen clear is requested, instead +of clearing it draws everything and uses "clear to end of line" for every line. + When scheme can't be found by configure there is no clear "not found" message: configure:5769: checking MzScheme install prefix configure:5781: result: diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt --- a/runtime/doc/vim9.txt +++ b/runtime/doc/vim9.txt @@ -107,7 +107,7 @@ script and `:def` functions; details are `:t` `:xit` - Some commands, especially those used for flow control, cannot be shortened. - E.g., `:throw` cannot be written as `:th`. *E839* + E.g., `:throw` cannot be written as `:th`. - You cannot use curly-braces names. - A range before a command must be prefixed with a colon: > :%s/this/that