From 6a13b8fa5460da5aa22a1c366e5252c26ed5fe1e Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Fri, 26 Aug 2022 19:58:10 +0200 Subject: vim-patch:7dd543246a4c (#19960) Update runtime files https://github.com/vim/vim/commit/7dd543246a4c21c4d5a4242a28076706f5abebd4 --- runtime/colors/darkblue.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/colors/darkblue.vim') diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim index b4c286af37..9e96a4638c 100644 --- 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: Mon Aug 8 15:21:06 2022 +" Last Updated: Tue 23 Aug 2022 16:50:35 MSK " 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') ? (&t_Co ? &t_Co : 0) : -1 +let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&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'] -- cgit From 4bf005e9fdfb57397475b2663a3651faa83886ff Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Tue, 6 Sep 2022 08:57:53 +0200 Subject: vim-patch:partial 0daafaa7d99e (#20083) Update runtime files https://github.com/vim/vim/commit/0daafaa7d99ef500f76b1b12f5fe8153e2fcaea0 skip vim9script ftplugin create userfunc.txt from Neovim content (skip section 3, needs 9.0.0379) --- runtime/colors/darkblue.vim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'runtime/colors/darkblue.vim') diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim index 9e96a4638c..4ce8687415 100644 --- 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: Tue 23 Aug 2022 16:50:35 MSK +" Last Updated: Fri 02 Sep 2022 09:40:36 MSK " Generated by Colortemplate v2.2.0 @@ -65,6 +65,8 @@ hi! link diffCommon WarningMsg hi! link diffBDiffer WarningMsg hi! link lCursor Cursor hi! link CurSearch Search +hi! link MessageWindow Pmenu +hi! link PopupNotification Todo hi Normal guifg=#c0c0c0 guibg=#000040 gui=NONE cterm=NONE hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE hi ColorColumn guifg=#c0c0c0 guibg=#8b0000 gui=NONE cterm=NONE @@ -171,6 +173,8 @@ if s:t_Co >= 256 hi! link diffBDiffer WarningMsg hi! link lCursor Cursor hi! link CurSearch Search + hi! link MessageWindow Pmenu + hi! link PopupNotification Todo hi Normal ctermfg=252 ctermbg=17 cterm=NONE hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE hi ColorColumn ctermfg=252 ctermbg=88 cterm=NONE -- cgit From 45cc5fd7656c48606bf337a4cc01380bedc8ba36 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Tue, 11 Oct 2022 23:35:35 +0200 Subject: fix(runtime): properly rely on t_Co for colorschemes (#20602) Problem: check for available colors failed Solution: simply trust t_Co, which is always available --- runtime/colors/darkblue.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/colors/darkblue.vim') diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim index 4ce8687415..9c84c280bd 100644 --- a/runtime/colors/darkblue.vim +++ b/runtime/colors/darkblue.vim @@ -13,7 +13,7 @@ set background=dark hi clear let g:colors_name = 'darkblue' -let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ? &t_Co : 0) : -1 +let s:t_Co = &t_Co 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'] -- cgit From b9632e58e3efa1635acac56cf136595c0b8bcc42 Mon Sep 17 00:00:00 2001 From: "C.D. MacEachern" Date: Mon, 17 Oct 2022 10:24:37 -0400 Subject: fix(runtime): use `g:terminal_color_{0-15}` in colorschemes (#20637) --- runtime/colors/darkblue.vim | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'runtime/colors/darkblue.vim') diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim index 9c84c280bd..c7bba4471e 100644 --- a/runtime/colors/darkblue.vim +++ b/runtime/colors/darkblue.vim @@ -17,6 +17,10 @@ let s:t_Co = &t_Co 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'] + " Nvim uses g:terminal_color_{0-15} instead + for i in range(g:terminal_ansi_colors->len()) + let g:terminal_color_{i} = g:terminal_ansi_colors[i] + endfor endif hi! link Terminal Normal hi! link CursorColumn CursorLine -- cgit