kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-0.8] fix(runtime): properly rely on t_Co for colorschemes (#20604)

Browse Source 
fix(runtime): properly rely on t_Co for colorschemes

Problem: check for available colors failed
Solution: simply trust t_Co, which is always available
(cherry picked from commit 5dbc713de7)

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
This commit is contained in:
github-actions[bot] 2022-10-11 23:49:05 +02:00 committed by GitHub
parent 0f669b7b70
commit 2853284434
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/colors/blue.vim
View File

@ -13,7 +13,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'blue' let g:colors_name = 'blue'
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') 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'] let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']

2
runtime/colors/darkblue.vim
View File

@ -13,7 +13,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'darkblue' 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') 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'] let g:terminal_ansi_colors = ['#000000', '#8b0000', '#90f020', '#ffa500', '#00008b', '#8b008b', '#008b8b', '#c0c0c0', '#808080', '#ffa0a0', '#90f020', '#ffff60', '#0030ff', '#ff00ff', '#90fff0', '#ffffff']

2
runtime/colors/delek.vim
View File

@ -13,7 +13,7 @@ set background=light
hi clear hi clear
let g:colors_name = 'delek' let g:colors_name = 'delek'
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') 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'] let g:terminal_ansi_colors = ['#ffffff', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#bcbcbc', '#ee0000', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#000000']

2
runtime/colors/desert.vim
View File

@ -13,7 +13,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'desert' let g:colors_name = 'desert'
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') 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'] let g:terminal_ansi_colors = ['#7f7f8c', '#cd5c5c', '#9acd32', '#bdb76b', '#75a0ff', '#eeee00', '#cd853f', '#666666', '#8a7f7f', '#ff0000', '#89fb98', '#f0e68c', '#6dceeb', '#ffde9b', '#ffa0a0', '#c2bfa5']

2
runtime/colors/elflord.vim
View File

@ -12,7 +12,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'elflord' let g:colors_name = 'elflord'
let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ? &t_Co : 0) : -1 let s:t_Co = &t_Co
hi! link Terminal Normal hi! link Terminal Normal
hi! link Boolean Constant hi! link Boolean Constant

2
runtime/colors/evening.vim
View File

@ -13,7 +13,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'evening' let g:colors_name = 'evening'
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') if (has('termguicolors') && &termguicolors) || has('gui_running')
let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0087ff', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff'] let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0087ff', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']

2
runtime/colors/habamax.vim
View File

@ -13,7 +13,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'habamax' let g:colors_name = 'habamax'
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') if (has('termguicolors') && &termguicolors) || has('gui_running')
let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d7875f', '#afd7af', '#d7d787', '#87afd7', '#d7afd7', '#87afaf', '#bcbcbc'] let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d7875f', '#afd7af', '#d7d787', '#87afd7', '#d7afd7', '#87afaf', '#bcbcbc']

2
runtime/colors/industry.vim
View File

@ -13,7 +13,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'industry' let g:colors_name = 'industry'
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') 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'] let g:terminal_ansi_colors = ['#303030', '#870000', '#5fd75f', '#afaf00', '#87afff', '#af00af', '#00afaf', '#6c6c6c', '#444444', '#ff0000', '#00ff00', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']

2
runtime/colors/koehler.vim
View File

@ -12,7 +12,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'koehler' let g:colors_name = 'koehler'
let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ? &t_Co : 0) : -1 let s:t_Co = &t_Co
hi! link Terminal Normal hi! link Terminal Normal
hi! link Boolean Constant hi! link Boolean Constant

2
runtime/colors/lunaperche.vim
View File

@ -11,7 +11,7 @@
hi clear hi clear
let g:colors_name = 'lunaperche' let g:colors_name = 'lunaperche'
let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ? &t_Co : 0) : -1 let s:t_Co = &t_Co
hi! link helpVim Title hi! link helpVim Title
hi! link helpHeader Title hi! link helpHeader Title

2
runtime/colors/morning.vim
View File

@ -13,7 +13,7 @@ set background=light
hi clear hi clear
let g:colors_name = 'morning' let g:colors_name = 'morning'
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') 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'] let g:terminal_ansi_colors = ['#e4e4e4', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#bcbcbc', '#0000ff', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#000000']

2
runtime/colors/murphy.vim
View File

@ -13,7 +13,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'murphy' let g:colors_name = 'murphy'
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') 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'] let g:terminal_ansi_colors = ['#303030', '#ffa700', '#005f00', '#ffd7af', '#87afff', '#ffafaf', '#00afaf', '#bcbcbc', '#444444', '#ff0000', '#00875f', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']

2
runtime/colors/pablo.vim
View File

@ -12,7 +12,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'pablo' let g:colors_name = 'pablo'
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') 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'] let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']

2
runtime/colors/peachpuff.vim
View File

@ -13,7 +13,7 @@ set background=light
hi clear hi clear
let g:colors_name = 'peachpuff' let g:colors_name = 'peachpuff'
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') 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'] let g:terminal_ansi_colors = ['#ffdab9', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#737373', '#406090', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#000000']

2
runtime/colors/quiet.vim
View File

@ -11,7 +11,7 @@
hi clear hi clear
let g:colors_name = 'quiet' let g:colors_name = 'quiet'
let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ? &t_Co : 0) : -1 let s:t_Co = &t_Co
hi! link Terminal Normal hi! link Terminal Normal
hi! link StatusLineTerm StatusLine hi! link StatusLineTerm StatusLine

2
runtime/colors/ron.vim
View File

@ -12,7 +12,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'ron' let g:colors_name = 'ron'
let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ? &t_Co : 0) : -1 let s:t_Co = &t_Co
hi! link Terminal Normal hi! link Terminal Normal
hi! link Boolean Constant hi! link Boolean Constant

2
runtime/colors/shine.vim
View File

@ -13,7 +13,7 @@ set background=light
hi clear hi clear
let g:colors_name = 'shine' let g:colors_name = 'shine'
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') 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'] let g:terminal_ansi_colors = ['#000000', '#8b0000', '#006400', '#ffff00', '#00008b', '#6a0dad', '#008b8b', '#dadada', '#767676', '#ffafaf', '#90ee90', '#ffff60', '#add8e6', '#ff00ff', '#00ffff', '#ffffff']

2
runtime/colors/slate.vim
View File

@ -13,7 +13,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'slate' let g:colors_name = 'slate'
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') 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'] let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']

2
runtime/colors/torte.vim
View File

@ -13,7 +13,7 @@ set background=dark
hi clear hi clear
let g:colors_name = 'torte' let g:colors_name = 'torte'
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') 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'] let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']

2
runtime/colors/zellner.vim
View File

@ -13,7 +13,7 @@ set background=light
hi clear hi clear
let g:colors_name = 'zellner' let g:colors_name = 'zellner'
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') 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'] let g:terminal_ansi_colors = ['#ffffff', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#a9a9a9', '#ff0000', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#000000']