From 7b0cda1da3db6368918eb6d3db67ff38a7640ec0 Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Thu, 27 Jun 2019 22:34:24 +0200 Subject: [PATCH] Fix CursorLine/CursorColumn/ColorColumn highlighting. Fixes also https://github.com/lifepillar/vim-solarized8/issues/72. --- colors/solarized8.vim | 26 +++++------- colors/solarized8_flat.vim | 18 ++++----- colors/solarized8_low.vim | 54 ++++++++++++------------- doc/solarized8.txt | 2 +- templates/solarized8.colortemplate | 6 +-- templates/solarized8_flat.colortemplate | 4 +- templates/solarized8_low.colortemplate | 13 +++--- 7 files changed, 54 insertions(+), 69 deletions(-) diff --git a/colors/solarized8.vim b/colors/solarized8.vim index 4630a5b..d148603 100644 --- a/colors/solarized8.vim +++ b/colors/solarized8.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " 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 diff --git a/colors/solarized8_flat.vim b/colors/solarized8_flat.vim index 60280a2..bbeb5dd 100644 --- a/colors/solarized8_flat.vim +++ b/colors/solarized8_flat.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Wed Jun 26 19:26:03 2019 +" Last Updated: Thu Jun 27 22:07:47 2019 " Generated by Colortemplate v2.0.0b3 @@ -81,7 +81,7 @@ 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=#839496 guibg=#002b36 guisp=NONE gui=NONE cterm=NONE - hi CursorLine guifg=NONE guibg=#002b36 guisp=NONE gui=NONE cterm=NONE + hi CursorLine guifg=NONE guibg=#073642 guisp=NONE gui=NONE cterm=NONE hi Terminal guifg=fg guibg=#002b36 guisp=NONE gui=NONE cterm=NONE hi ToolbarButton guifg=#93a1a1 guibg=#073642 guisp=NONE gui=bold cterm=bold hi ToolbarLine guifg=NONE guibg=#073642 guisp=NONE gui=NONE cterm=NONE @@ -421,7 +421,7 @@ 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=#657b83 guibg=#fdf6e3 guisp=NONE gui=NONE cterm=NONE - hi CursorLine guifg=NONE guibg=#fdf6e3 guisp=NONE gui=NONE cterm=NONE + hi CursorLine guifg=NONE guibg=#eee8d5 guisp=NONE gui=NONE cterm=NONE hi Terminal guifg=fg guibg=#fdf6e3 guisp=NONE gui=NONE cterm=NONE hi ToolbarButton guifg=#586e75 guibg=#eee8d5 guisp=NONE gui=bold cterm=bold hi ToolbarLine guifg=NONE guibg=#eee8d5 guisp=NONE gui=NONE cterm=NONE @@ -757,7 +757,7 @@ 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=235 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE hi Terminal ctermfg=fg ctermbg=235 cterm=NONE hi ToolbarButton ctermfg=247 ctermbg=236 cterm=bold hi ToolbarLine ctermfg=NONE ctermbg=236 cterm=NONE @@ -1076,7 +1076,7 @@ if s:t_Co >= 256 hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE else " opaque hi Normal ctermfg=66 ctermbg=230 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=230 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE hi Terminal ctermfg=fg ctermbg=230 cterm=NONE hi ToolbarButton ctermfg=242 ctermbg=254 cterm=bold hi ToolbarLine ctermfg=NONE ctermbg=254 cterm=NONE @@ -1409,7 +1409,7 @@ if s:t_Co >= 16 hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE else " opaque hi Normal ctermfg=12 ctermbg=8 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=8 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=0 cterm=NONE hi Terminal ctermfg=fg ctermbg=8 cterm=NONE hi ToolbarButton ctermfg=14 ctermbg=0 cterm=bold hi ToolbarLine ctermfg=NONE ctermbg=0 cterm=NONE @@ -1728,7 +1728,7 @@ if s:t_Co >= 16 hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE else " opaque hi Normal ctermfg=11 ctermbg=15 cterm=NONE - hi CursorLine ctermfg=NONE ctermbg=15 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=7 cterm=NONE hi Terminal ctermfg=fg ctermbg=15 cterm=NONE hi ToolbarButton ctermfg=10 ctermbg=7 cterm=bold hi ToolbarLine ctermfg=NONE ctermbg=7 cterm=NONE @@ -2193,7 +2193,7 @@ endif " ToolbarLine none none " else " opaque " Normal base0 back -" CursorLine none base03 +" CursorLine none base02 " Terminal fg back " ToolbarButton base1 base02 bold " ToolbarLine none base02 @@ -2513,7 +2513,7 @@ endif " ToolbarLine none none " else " opaque " Normal base0 back -" CursorLine none base03 +" CursorLine none base02 " Terminal fg back " ToolbarButton base1 base02 bold " ToolbarLine none base02 diff --git a/colors/solarized8_low.vim b/colors/solarized8_low.vim index c369625..86bdb4b 100644 --- a/colors/solarized8_low.vim +++ b/colors/solarized8_low.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " 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 diff --git a/doc/solarized8.txt b/doc/solarized8.txt index abcb3ad..f3a04ac 100644 --- a/doc/solarized8.txt +++ b/doc/solarized8.txt @@ -1,4 +1,4 @@ -*solarized8.txt* For Vim version 8.1 Last change: 2019 Jun 26 +*solarized8.txt* For Vim version 8.1 Last change: 2019 Jun 27 Solarized 8 color scheme diff --git a/templates/solarized8.colortemplate b/templates/solarized8.colortemplate index fbaecb0..60d301b 100644 --- a/templates/solarized8.colortemplate +++ b/templates/solarized8.colortemplate @@ -44,7 +44,6 @@ Include: _fix-256-palette.colortemplate # Transparency (dark) {{{ #if s:termtrans Normal base1 none - CursorLine none none underline s=base1 FoldColumn fg none Folded fg none bold s=base03 Terminal fg none @@ -52,7 +51,6 @@ Include: _fix-256-palette.colortemplate ToolbarLine none none #else " opaque Normal base1 back - CursorLine none base02 FoldColumn base0 base02 Folded base0 base02 bold s=base03 Terminal fg back @@ -163,6 +161,7 @@ Variant: gui 256 16 ColorColumn none base02 Conceal blue none CursorColumn none base02 +CursorLine none base02 Directory blue none EndOfBuffer none none ErrorMsg red base3 reverse @@ -241,7 +240,6 @@ Include: _light_terminal.colortemplate # Transparency (light) {{{ #if s:termtrans Normal base1 none - CursorLine none none underline s=base1 FoldColumn base0 none Folded base0 none bold s=base03 Terminal fg none @@ -249,7 +247,6 @@ Include: _light_terminal.colortemplate ToolbarLine none none #else " opaque Normal base1 back - CursorLine none base02 FoldColumn base0 base02 Folded base0 base02 bold s=base03 Terminal fg back @@ -374,6 +371,7 @@ Variant: gui 256 16 ColorColumn none base02 Conceal blue none CursorColumn none base02 +CursorLine none base02 Directory blue none EndOfBuffer none none ErrorMsg red base03 reverse diff --git a/templates/solarized8_flat.colortemplate b/templates/solarized8_flat.colortemplate index 0d1dbad..71f863a 100644 --- a/templates/solarized8_flat.colortemplate +++ b/templates/solarized8_flat.colortemplate @@ -44,7 +44,7 @@ Include: _dark_terminal.colortemplate ToolbarLine none none #else " opaque Normal base0 back - CursorLine none base03 + CursorLine none base02 Terminal fg back ToolbarButton base1 base02 bold ToolbarLine none base02 @@ -212,7 +212,7 @@ Include: _light_terminal.colortemplate ToolbarLine none none #else " opaque Normal base0 back - CursorLine none base03 + CursorLine none base02 Terminal fg back ToolbarButton base1 base02 bold ToolbarLine none base02 diff --git a/templates/solarized8_low.colortemplate b/templates/solarized8_low.colortemplate index cf0016e..12d2b21 100644 --- a/templates/solarized8_low.colortemplate +++ b/templates/solarized8_low.colortemplate @@ -38,7 +38,6 @@ Include: _dark_terminal.colortemplate # Transparency (dark) {{{ #if s:termtrans Normal base0 none - CursorLine none none underline s=base1 FoldColumn fg none Folded fg none bold s=base03 LineNr base01 none @@ -47,7 +46,6 @@ Include: _dark_terminal.colortemplate ToolbarLine none none #else Normal base0 back - CursorLine none base02 FoldColumn base0 base02 Folded base0 base02 bold s=base03 LineNr base01 base02 @@ -151,9 +149,10 @@ Variant: gui 256 16 #endif # }}} # Base groups (dark) {{{ -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 @@ -353,10 +352,10 @@ Variant: gui 256 16 #endif # }}} # Base groups (light) {{{ -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