Fix CursorLine/CursorColumn/ColorColumn highlighting.

Fixes also https://github.com/lifepillar/vim-solarized8/issues/72.
This commit is contained in:
Lifepillar
2019-06-27 22:34:24 +02:00
parent c518404623
commit 7b0cda1da3
7 changed files with 54 additions and 69 deletions

View File

@@ -4,7 +4,7 @@
" Maintainer: Lifepillar <lifepillar@lifepillar.me>
" Website: https://github.com/lifepillar/vim-solarized8
" License: OSI approved MIT license
" Last Updated: Wed Jun 26 19:26:01 2019
" Last Updated: Thu Jun 27 22:05:05 2019
" Generated by Colortemplate v2.0.0b3
@@ -75,7 +75,6 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
endif
if s:termtrans
hi Normal guifg=#93a1a1 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi CursorLine guifg=NONE guibg=NONE guisp=#93a1a1 gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
hi FoldColumn guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi Folded guifg=fg guibg=NONE guisp=#002b36 gui=bold cterm=bold
hi Terminal guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE
@@ -83,7 +82,6 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
else " opaque
hi Normal guifg=#93a1a1 guibg=#002b36 guisp=NONE gui=NONE cterm=NONE
hi CursorLine guifg=NONE guibg=#073642 guisp=NONE gui=NONE cterm=NONE
hi FoldColumn guifg=#839496 guibg=#073642 guisp=NONE gui=NONE cterm=NONE
hi Folded guifg=#839496 guibg=#073642 guisp=#002b36 gui=bold cterm=bold
hi Terminal guifg=fg guibg=#002b36 guisp=NONE gui=NONE cterm=NONE
@@ -171,6 +169,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
hi ColorColumn guifg=NONE guibg=#073642 guisp=NONE gui=NONE cterm=NONE
hi Conceal guifg=#268bd2 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi CursorColumn guifg=NONE guibg=#073642 guisp=NONE gui=NONE cterm=NONE
hi CursorLine guifg=NONE guibg=#073642 guisp=NONE gui=NONE cterm=NONE
hi Directory guifg=#268bd2 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi EndOfBuffer guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
hi ErrorMsg guifg=#dc322f guibg=#fdf6e3 guisp=NONE gui=reverse cterm=reverse
@@ -432,7 +431,6 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
endif
if s:termtrans
hi Normal guifg=#586e75 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi CursorLine guifg=NONE guibg=NONE guisp=#586e75 gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
hi FoldColumn guifg=#657b83 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi Folded guifg=#657b83 guibg=NONE guisp=#fdf6e3 gui=bold cterm=bold
hi Terminal guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE
@@ -440,7 +438,6 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
else " opaque
hi Normal guifg=#586e75 guibg=#fdf6e3 guisp=NONE gui=NONE cterm=NONE
hi CursorLine guifg=NONE guibg=#eee8d5 guisp=NONE gui=NONE cterm=NONE
hi FoldColumn guifg=#657b83 guibg=#eee8d5 guisp=NONE gui=NONE cterm=NONE
hi Folded guifg=#657b83 guibg=#eee8d5 guisp=#fdf6e3 gui=bold cterm=bold
hi Terminal guifg=fg guibg=#fdf6e3 guisp=NONE gui=NONE cterm=NONE
@@ -544,6 +541,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
hi ColorColumn guifg=NONE guibg=#eee8d5 guisp=NONE gui=NONE cterm=NONE
hi Conceal guifg=#268bd2 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi CursorColumn guifg=NONE guibg=#eee8d5 guisp=NONE gui=NONE cterm=NONE
hi CursorLine guifg=NONE guibg=#eee8d5 guisp=NONE gui=NONE cterm=NONE
hi Directory guifg=#268bd2 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi EndOfBuffer guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
hi ErrorMsg guifg=#dc322f guibg=#fdf6e3 guisp=NONE gui=reverse cterm=reverse
@@ -784,7 +782,6 @@ if s:t_Co >= 256
if &background ==# 'dark'
if s:termtrans
hi Normal ctermfg=247 ctermbg=NONE cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
hi FoldColumn ctermfg=fg ctermbg=NONE cterm=NONE
hi Folded ctermfg=fg ctermbg=NONE cterm=bold
hi Terminal ctermfg=fg ctermbg=NONE cterm=NONE
@@ -795,7 +792,6 @@ if s:t_Co >= 256
if !has('patch-8.0.0616') && !has('nvim') " Fix for Vim bug
set background=dark
endif
hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
hi FoldColumn ctermfg=246 ctermbg=236 cterm=NONE
hi Folded ctermfg=246 ctermbg=236 cterm=bold
hi Terminal ctermfg=fg ctermbg=235 cterm=NONE
@@ -883,6 +879,7 @@ if s:t_Co >= 256
hi ColorColumn ctermfg=NONE ctermbg=236 cterm=NONE
hi Conceal ctermfg=32 ctermbg=NONE cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
hi Directory ctermfg=32 ctermbg=NONE cterm=NONE
hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
hi ErrorMsg ctermfg=160 ctermbg=230 cterm=reverse
@@ -1123,7 +1120,6 @@ if s:t_Co >= 256
" Light background
if s:termtrans
hi Normal ctermfg=242 ctermbg=NONE cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
hi FoldColumn ctermfg=66 ctermbg=NONE cterm=NONE
hi Folded ctermfg=66 ctermbg=NONE cterm=bold
hi Terminal ctermfg=fg ctermbg=NONE cterm=NONE
@@ -1131,7 +1127,6 @@ if s:t_Co >= 256
hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
else " opaque
hi Normal ctermfg=242 ctermbg=230 cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
hi FoldColumn ctermfg=66 ctermbg=254 cterm=NONE
hi Folded ctermfg=66 ctermbg=254 cterm=bold
hi Terminal ctermfg=fg ctermbg=230 cterm=NONE
@@ -1235,6 +1230,7 @@ if s:t_Co >= 256
hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
hi Conceal ctermfg=32 ctermbg=NONE cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
hi Directory ctermfg=32 ctermbg=NONE cterm=NONE
hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
hi ErrorMsg ctermfg=160 ctermbg=230 cterm=reverse
@@ -1475,7 +1471,6 @@ if s:t_Co >= 16
if &background ==# 'dark'
if s:termtrans
hi Normal ctermfg=14 ctermbg=NONE cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
hi FoldColumn ctermfg=fg ctermbg=NONE cterm=NONE
hi Folded ctermfg=fg ctermbg=NONE cterm=bold
hi Terminal ctermfg=fg ctermbg=NONE cterm=NONE
@@ -1483,7 +1478,6 @@ if s:t_Co >= 16
hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
else " opaque
hi Normal ctermfg=14 ctermbg=8 cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=0 cterm=NONE
hi FoldColumn ctermfg=12 ctermbg=0 cterm=NONE
hi Folded ctermfg=12 ctermbg=0 cterm=bold
hi Terminal ctermfg=fg ctermbg=8 cterm=NONE
@@ -1571,6 +1565,7 @@ if s:t_Co >= 16
hi ColorColumn ctermfg=NONE ctermbg=0 cterm=NONE
hi Conceal ctermfg=4 ctermbg=NONE cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=0 cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=0 cterm=NONE
hi Directory ctermfg=4 ctermbg=NONE cterm=NONE
hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
hi ErrorMsg ctermfg=1 ctermbg=15 cterm=reverse
@@ -1811,7 +1806,6 @@ if s:t_Co >= 16
" Light background
if s:termtrans
hi Normal ctermfg=10 ctermbg=NONE cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
hi FoldColumn ctermfg=11 ctermbg=NONE cterm=NONE
hi Folded ctermfg=11 ctermbg=NONE cterm=bold
hi Terminal ctermfg=fg ctermbg=NONE cterm=NONE
@@ -1819,7 +1813,6 @@ if s:t_Co >= 16
hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
else " opaque
hi Normal ctermfg=10 ctermbg=15 cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=7 cterm=NONE
hi FoldColumn ctermfg=11 ctermbg=7 cterm=NONE
hi Folded ctermfg=11 ctermbg=7 cterm=bold
hi Terminal ctermfg=fg ctermbg=15 cterm=NONE
@@ -1923,6 +1916,7 @@ if s:t_Co >= 16
hi ColorColumn ctermfg=NONE ctermbg=7 cterm=NONE
hi Conceal ctermfg=4 ctermbg=NONE cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=7 cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=7 cterm=NONE
hi Directory ctermfg=4 ctermbg=NONE cterm=NONE
hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
hi ErrorMsg ctermfg=1 ctermbg=15 cterm=reverse
@@ -2295,7 +2289,6 @@ endif
" Term Colors: base03 orange base01 base00 base0 violet base1 base3
" if s:termtrans
" Normal base1 none
" CursorLine none none underline s=base1
" FoldColumn fg none
" Folded fg none bold s=base03
" Terminal fg none
@@ -2303,7 +2296,6 @@ endif
" ToolbarLine none none
" else " opaque
" Normal base1 back
" CursorLine none base02
" FoldColumn base0 base02
" Folded base0 base02 bold s=base03
" Terminal fg back
@@ -2398,6 +2390,7 @@ endif
" ColorColumn none base02
" Conceal blue none
" CursorColumn none base02
" CursorLine none base02
" Directory blue none
" EndOfBuffer none none
" ErrorMsg red base3 reverse
@@ -2639,7 +2632,6 @@ endif
" Term Colors: base3 orange base1 base0 base00 violet base01 base03
" if s:termtrans
" Normal base1 none
" CursorLine none none underline s=base1
" FoldColumn base0 none
" Folded base0 none bold s=base03
" Terminal fg none
@@ -2647,7 +2639,6 @@ endif
" ToolbarLine none none
" else " opaque
" Normal base1 back
" CursorLine none base02
" FoldColumn base0 base02
" Folded base0 base02 bold s=base03
" Terminal fg back
@@ -2758,6 +2749,7 @@ endif
" ColorColumn none base02
" Conceal blue none
" CursorColumn none base02
" CursorLine none base02
" Directory blue none
" EndOfBuffer none none
" ErrorMsg red base03 reverse