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:06 2019
" Last Updated: Thu Jun 27 22:26:30 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=#839496 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 LineNr guifg=#586e75 guibg=NONE guisp=NONE gui=NONE cterm=NONE
@@ -84,7 +83,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
hi Normal guifg=#839496 guibg=#073642 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 LineNr guifg=#586e75 guibg=#073642 guisp=NONE gui=NONE cterm=NONE
@@ -166,9 +164,10 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
hi TabLineSel guifg=#839496 guibg=#073642 guisp=NONE gui=reverse cterm=reverse
hi VertSplit guifg=#93a1a1 guibg=#586e75 guisp=NONE gui=NONE cterm=NONE
endif
hi ColorColumn guifg=NONE guibg=#073642 guisp=NONE gui=NONE cterm=NONE
hi ColorColumn guifg=NONE guibg=#586e75 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 CursorColumn guifg=NONE guibg=#586e75 guisp=NONE gui=NONE cterm=NONE
hi CursorLine guifg=NONE guibg=NONE guisp=#93a1a1 gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
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
@@ -531,10 +530,10 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
hi VertSplit guifg=#586e75 guibg=#93a1a1 guisp=NONE gui=NONE cterm=NONE
hi WildMenu guifg=#839496 guibg=#eee8d5 guisp=NONE gui=reverse cterm=reverse
endif
hi ColorColumn guifg=NONE guibg=#eee8d5 guisp=NONE gui=NONE cterm=NONE
hi ColorColumn guifg=#eee8d5 guibg=#93a1a1 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=#586e75 gui=underline cterm=underline
hi CursorColumn guifg=#eee8d5 guibg=#93a1a1 guisp=NONE gui=NONE cterm=NONE
hi CursorLine guifg=NONE guibg=NONE guisp=#839496 gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
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
@@ -775,7 +774,6 @@ if s:t_Co >= 256
if &background ==# 'dark'
if s:termtrans
hi Normal ctermfg=246 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 LineNr ctermfg=242 ctermbg=NONE cterm=NONE
@@ -787,7 +785,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=239 cterm=NONE
hi FoldColumn ctermfg=246 ctermbg=239 cterm=NONE
hi Folded ctermfg=246 ctermbg=239 cterm=bold
hi LineNr ctermfg=242 ctermbg=239 cterm=NONE
@@ -869,9 +866,10 @@ if s:t_Co >= 256
hi TabLineSel ctermfg=246 ctermbg=239 cterm=reverse
hi VertSplit ctermfg=247 ctermbg=242 cterm=NONE
endif
hi ColorColumn ctermfg=NONE ctermbg=239 cterm=NONE
hi ColorColumn ctermfg=NONE ctermbg=242 cterm=NONE
hi Conceal ctermfg=32 ctermbg=NONE cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=239 cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=242 cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
hi Directory ctermfg=32 ctermbg=NONE cterm=NONE
hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
hi ErrorMsg ctermfg=160 ctermbg=230 cterm=reverse
@@ -1213,10 +1211,10 @@ if s:t_Co >= 256
hi VertSplit ctermfg=242 ctermbg=247 cterm=NONE
hi WildMenu ctermfg=246 ctermbg=254 cterm=reverse
endif
hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
hi ColorColumn ctermfg=254 ctermbg=247 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=underline
hi CursorColumn ctermfg=254 ctermbg=247 cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
hi Directory ctermfg=32 ctermbg=NONE cterm=NONE
hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
hi ErrorMsg ctermfg=160 ctermbg=230 cterm=reverse
@@ -1457,7 +1455,6 @@ if s:t_Co >= 16
if &background ==# 'dark'
if s:termtrans
hi Normal ctermfg=12 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 LineNr ctermfg=10 ctermbg=NONE cterm=NONE
@@ -1466,7 +1463,6 @@ if s:t_Co >= 16
hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
else
hi Normal ctermfg=12 ctermbg=0 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 LineNr ctermfg=10 ctermbg=0 cterm=NONE
@@ -1548,9 +1544,10 @@ if s:t_Co >= 16
hi TabLineSel ctermfg=12 ctermbg=0 cterm=reverse
hi VertSplit ctermfg=14 ctermbg=10 cterm=NONE
endif
hi ColorColumn ctermfg=NONE ctermbg=0 cterm=NONE
hi ColorColumn ctermfg=NONE ctermbg=10 cterm=NONE
hi Conceal ctermfg=4 ctermbg=NONE cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=0 cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=10 cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
hi Directory ctermfg=4 ctermbg=NONE cterm=NONE
hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
hi ErrorMsg ctermfg=1 ctermbg=15 cterm=reverse
@@ -1892,10 +1889,10 @@ if s:t_Co >= 16
hi VertSplit ctermfg=10 ctermbg=14 cterm=NONE
hi WildMenu ctermfg=12 ctermbg=7 cterm=reverse
endif
hi ColorColumn ctermfg=NONE ctermbg=7 cterm=NONE
hi ColorColumn ctermfg=7 ctermbg=14 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=underline
hi CursorColumn ctermfg=7 ctermbg=14 cterm=NONE
hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
hi Directory ctermfg=4 ctermbg=NONE cterm=NONE
hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
hi ErrorMsg ctermfg=1 ctermbg=15 cterm=reverse
@@ -2268,7 +2265,6 @@ endif
" Term Colors: base03 orange base01 base00 base0 violet base1 base3
" if s:termtrans
" Normal base0 none
" CursorLine none none underline s=base1
" FoldColumn fg none
" Folded fg none bold s=base03
" LineNr base01 none
@@ -2277,7 +2273,6 @@ endif
" ToolbarLine none none
" else
" Normal base0 back
" CursorLine none base02
" FoldColumn base0 base02
" Folded base0 base02 bold s=base03
" LineNr base01 base02
@@ -2365,9 +2360,10 @@ endif
" TabLineSel base0 base02 reverse
" VertSplit base1 base01
" endif
" ColorColumn none base02
" ColorColumn none base01
" Conceal blue none
" CursorColumn none base02
" CursorColumn none base01
" CursorLine none none underline s=base1
" Directory blue none
" EndOfBuffer none none
" ErrorMsg red base3 reverse
@@ -2718,10 +2714,10 @@ endif
" VertSplit base1 base01
" WildMenu base00 base02 reverse
" endif
" ColorColumn none base02
" ColorColumn base02 base01
" Conceal blue none
" CursorColumn none base02
" CursorLine none base02 underline s=base1
" CursorColumn base02 base01
" CursorLine none none underline s=base00
" Directory blue none
" EndOfBuffer none none
" ErrorMsg red base03 reverse