From 370826108b22e5ea95d842dda620e091436a12c1 Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Sat, 28 Oct 2017 21:29:37 +0200 Subject: [PATCH] Fix invisible cursor in light themes. Fix a regression causing the cursor to be invisible in light themes. --- colors/solarized8_light.vim | 20 +++++++-------- colors/solarized8_light_flat.vim | 40 ++++++++--------------------- colors/solarized8_light_high.vim | 20 +++++++-------- colors/solarized8_light_low.vim | 20 +++++++-------- solarized8_light.colortemplate | 6 ++--- solarized8_light_flat.colortemplate | 21 +++------------ solarized8_light_high.colortemplate | 6 ++--- solarized8_light_low.colortemplate | 6 ++--- 8 files changed, 52 insertions(+), 87 deletions(-) diff --git a/colors/solarized8_light.vim b/colors/solarized8_light.vim index aa25d21..11a9328 100644 --- a/colors/solarized8_light.vim +++ b/colors/solarized8_light.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sat Oct 28 17:20:30 2017 +" Last Updated: Sat Oct 28 21:25:46 2017 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256)) @@ -66,7 +66,7 @@ if get(g:, "solarized_visibility", "") == "high" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=11 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=1 ctermbg=15 guifg=#dc322f guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=1 guifg=#fdf6e3 guibg=#dc322f guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=15 ctermbg=12 guifg=#fdf6e3 guibg=#839496 guisp=NONE cterm=NONE,bold gui=NONE,bold hi NonText ctermfg=1 ctermbg=NONE guifg=#dc322f guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -76,7 +76,7 @@ elseif get(g:, "solarized_visibility", "") == "low" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=11 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=9 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=1 ctermbg=7 guifg=#dc322f guibg=#eee8d5 guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline hi NonText ctermfg=7 ctermbg=NONE guifg=#eee8d5 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -86,7 +86,7 @@ else if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=11 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=9 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=1 ctermbg=7 guifg=#dc322f guibg=#eee8d5 guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline hi NonText ctermfg=12 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -421,7 +421,7 @@ if get(g:, "solarized_visibility", "") == "high" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=66 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=160 ctermbg=230 guifg=#dc322f guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=160 guifg=#fdf6e3 guibg=#dc322f guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=230 ctermbg=246 guifg=#fdf6e3 guibg=#839496 guisp=NONE cterm=NONE,bold gui=NONE,bold hi NonText ctermfg=160 ctermbg=NONE guifg=#dc322f guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -431,7 +431,7 @@ elseif get(g:, "solarized_visibility", "") == "low" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=66 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=166 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=160 ctermbg=254 guifg=#dc322f guibg=#eee8d5 guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline hi NonText ctermfg=254 ctermbg=NONE guifg=#eee8d5 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -441,7 +441,7 @@ else if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=66 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=166 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=160 ctermbg=254 guifg=#dc322f guibg=#eee8d5 guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline hi NonText ctermfg=246 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -780,7 +780,7 @@ endif " verbatim " else " endverbatim -" Cursor red base03 +" Cursor base03 red " verbatim " endif " endverbatim @@ -795,7 +795,7 @@ endif " verbatim " else " endverbatim -" Cursor orange base03 +" Cursor base03 orange " verbatim " endif " endverbatim @@ -811,7 +811,7 @@ endif " verbatim " else " endverbatim -" Cursor orange base03 +" Cursor base03 orange " verbatim " endif " endverbatim diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim index d7509b2..efdd356 100644 --- a/colors/solarized8_light_flat.vim +++ b/colors/solarized8_light_flat.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sat Oct 28 17:20:31 2017 +" Last Updated: Sat Oct 28 21:27:06 2017 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256)) @@ -48,18 +48,13 @@ hi Normal ctermfg=11 ctermbg=15 guifg=#657b83 guibg=#fdf6e3 guisp=NONE cterm=NON endif hi ColorColumn ctermfg=NONE ctermbg=7 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE hi Conceal ctermfg=4 ctermbg=NONE guifg=#268bd2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -if get(g:, 'solarized_old_cursor_style', 0) -hi Cursor ctermfg=15 ctermbg=11 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE -else -hi Cursor ctermfg=8 ctermbg=4 guifg=#002b36 guibg=#268bd2 guisp=NONE cterm=NONE gui=NONE -endif hi CursorColumn ctermfg=NONE ctermbg=7 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE hi CursorLine ctermfg=NONE ctermbg=15 guifg=NONE guibg=#fdf6e3 guisp=#93a1a1 cterm=NONE,underline gui=NONE,underline if get(g:, "solarized_visibility", "") == "high" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=11 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=1 ctermbg=15 guifg=#dc322f guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=1 guifg=#fdf6e3 guibg=#dc322f guisp=NONE cterm=NONE gui=NONE endif hi CursorLineNr ctermfg=1 ctermbg=NONE guifg=#dc322f guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold hi MatchParen ctermfg=9 ctermbg=7 guifg=#cb4b16 guibg=#eee8d5 guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline @@ -70,7 +65,7 @@ elseif get(g:, "solarized_visibility", "") == "low" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=11 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=9 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi CursorLineNr ctermfg=14 ctermbg=NONE guifg=#93a1a1 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold hi MatchParen ctermfg=9 ctermbg=7 guifg=#cb4b16 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -81,7 +76,7 @@ else if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=11 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=9 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi CursorLineNr ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold hi MatchParen ctermfg=8 ctermbg=7 guifg=#002b36 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -407,18 +402,13 @@ hi Normal ctermfg=66 ctermbg=230 guifg=#657b83 guibg=#fdf6e3 guisp=NONE cterm=NO endif hi ColorColumn ctermfg=NONE ctermbg=254 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE hi Conceal ctermfg=32 ctermbg=NONE guifg=#268bd2 guibg=NONE guisp=NONE cterm=NONE gui=NONE -if get(g:, 'solarized_old_cursor_style', 0) -hi Cursor ctermfg=230 ctermbg=66 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE -else -hi Cursor ctermfg=235 ctermbg=32 guifg=#002b36 guibg=#268bd2 guisp=NONE cterm=NONE gui=NONE -endif hi CursorColumn ctermfg=NONE ctermbg=254 guifg=NONE guibg=#eee8d5 guisp=NONE cterm=NONE gui=NONE hi CursorLine ctermfg=NONE ctermbg=230 guifg=NONE guibg=#fdf6e3 guisp=#93a1a1 cterm=NONE,underline gui=NONE,underline if get(g:, "solarized_visibility", "") == "high" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=66 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=160 ctermbg=230 guifg=#dc322f guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=160 guifg=#fdf6e3 guibg=#dc322f guisp=NONE cterm=NONE gui=NONE endif hi CursorLineNr ctermfg=160 ctermbg=NONE guifg=#dc322f guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold hi MatchParen ctermfg=166 ctermbg=254 guifg=#cb4b16 guibg=#eee8d5 guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline @@ -429,7 +419,7 @@ elseif get(g:, "solarized_visibility", "") == "low" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=66 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=166 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi CursorLineNr ctermfg=247 ctermbg=NONE guifg=#93a1a1 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold hi MatchParen ctermfg=166 ctermbg=254 guifg=#cb4b16 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -440,7 +430,7 @@ else if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=66 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=166 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi CursorLineNr ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold hi MatchParen ctermfg=235 ctermbg=254 guifg=#002b36 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -780,16 +770,6 @@ endif " Normal base0 back " ColorColumn none base02 " Conceal blue none -" verbatim -" endverbatim -" Cursor base03 base0 -" verbatim -" else -" endverbatim -" Cursor base3 blue -" verbatim -" endif -" endverbatim " CursorColumn none base02 " CursorLine none base03 underline s=base01 " verbatim @@ -798,7 +778,7 @@ endif " verbatim " else " endverbatim -" Cursor red base03 +" Cursor base03 red " verbatim " endif " endverbatim @@ -813,7 +793,7 @@ endif " verbatim " else " endverbatim -" Cursor orange base03 +" Cursor base03 orange " verbatim " endif " endverbatim @@ -829,7 +809,7 @@ endif " verbatim " else " endverbatim -" Cursor orange base03 +" Cursor base03 orange " verbatim " endif " endverbatim diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim index 0a7ce43..694c9c5 100644 --- a/colors/solarized8_light_high.vim +++ b/colors/solarized8_light_high.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sat Oct 28 17:20:33 2017 +" Last Updated: Sat Oct 28 21:27:55 2017 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256)) @@ -67,7 +67,7 @@ if get(g:, "solarized_visibility", "") == "high" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=10 guifg=#fdf6e3 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=1 ctermbg=15 guifg=#dc322f guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=1 guifg=#fdf6e3 guibg=#dc322f guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=15 ctermbg=11 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE,bold gui=NONE,bold hi NonText ctermfg=1 ctermbg=NONE guifg=#dc322f guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -77,7 +77,7 @@ elseif get(g:, "solarized_visibility", "") == "low" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=10 guifg=#fdf6e3 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=9 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=1 ctermbg=7 guifg=#dc322f guibg=#eee8d5 guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline hi NonText ctermfg=7 ctermbg=NONE guifg=#eee8d5 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -87,7 +87,7 @@ else if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=10 guifg=#fdf6e3 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=9 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=1 ctermbg=7 guifg=#dc322f guibg=#eee8d5 guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline hi NonText ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -422,7 +422,7 @@ if get(g:, "solarized_visibility", "") == "high" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=242 guifg=#fdf6e3 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=160 ctermbg=230 guifg=#dc322f guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=160 guifg=#fdf6e3 guibg=#dc322f guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=230 ctermbg=66 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE,bold gui=NONE,bold hi NonText ctermfg=160 ctermbg=NONE guifg=#dc322f guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -432,7 +432,7 @@ elseif get(g:, "solarized_visibility", "") == "low" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=242 guifg=#fdf6e3 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=166 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=160 ctermbg=254 guifg=#dc322f guibg=#eee8d5 guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline hi NonText ctermfg=254 ctermbg=NONE guifg=#eee8d5 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -442,7 +442,7 @@ else if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=242 guifg=#fdf6e3 guibg=#586e75 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=166 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=160 ctermbg=254 guifg=#dc322f guibg=#eee8d5 guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline hi NonText ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -782,7 +782,7 @@ endif " verbatim " else " endverbatim -" Cursor red base03 +" Cursor base03 red " verbatim " endif " endverbatim @@ -797,7 +797,7 @@ endif " verbatim " else " endverbatim -" Cursor orange base03 +" Cursor base03 orange " verbatim " endif " endverbatim @@ -813,7 +813,7 @@ endif " verbatim " else " endverbatim -" Cursor orange base03 +" Cursor base03 orange " verbatim " endif " endverbatim diff --git a/colors/solarized8_light_low.vim b/colors/solarized8_light_low.vim index fb354c0..395e293 100644 --- a/colors/solarized8_light_low.vim +++ b/colors/solarized8_light_low.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sat Oct 28 17:20:34 2017 +" Last Updated: Sat Oct 28 21:29:21 2017 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256)) @@ -66,7 +66,7 @@ if get(g:, "solarized_visibility", "") == "high" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=11 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=1 ctermbg=15 guifg=#dc322f guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=1 guifg=#fdf6e3 guibg=#dc322f guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=8 ctermbg=NONE guifg=#002b36 guibg=NONE guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline hi NonText ctermfg=1 ctermbg=NONE guifg=#dc322f guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -76,7 +76,7 @@ elseif get(g:, "solarized_visibility", "") == "low" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=11 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=9 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=8 ctermbg=7 guifg=#002b36 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold hi NonText ctermfg=7 ctermbg=NONE guifg=#eee8d5 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -86,7 +86,7 @@ else if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=15 ctermbg=11 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=9 ctermbg=15 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=15 ctermbg=9 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=8 ctermbg=7 guifg=#002b36 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold hi NonText ctermfg=12 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -421,7 +421,7 @@ if get(g:, "solarized_visibility", "") == "high" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=66 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=160 ctermbg=230 guifg=#dc322f guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=160 guifg=#fdf6e3 guibg=#dc322f guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=235 ctermbg=NONE guifg=#002b36 guibg=NONE guisp=NONE cterm=NONE,bold,underline gui=NONE,bold,underline hi NonText ctermfg=160 ctermbg=NONE guifg=#dc322f guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -431,7 +431,7 @@ elseif get(g:, "solarized_visibility", "") == "low" if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=66 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=166 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=235 ctermbg=254 guifg=#002b36 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold hi NonText ctermfg=254 ctermbg=NONE guifg=#eee8d5 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -441,7 +441,7 @@ else if get(g:, 'solarized_old_cursor_style', 0) hi Cursor ctermfg=230 ctermbg=66 guifg=#fdf6e3 guibg=#657b83 guisp=NONE cterm=NONE gui=NONE else -hi Cursor ctermfg=166 ctermbg=230 guifg=#cb4b16 guibg=#fdf6e3 guisp=NONE cterm=NONE gui=NONE +hi Cursor ctermfg=230 ctermbg=166 guifg=#fdf6e3 guibg=#cb4b16 guisp=NONE cterm=NONE gui=NONE endif hi MatchParen ctermfg=235 ctermbg=254 guifg=#002b36 guibg=#eee8d5 guisp=NONE cterm=NONE,bold gui=NONE,bold hi NonText ctermfg=246 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE,bold gui=NONE,bold @@ -780,7 +780,7 @@ endif " verbatim " else " endverbatim -" Cursor red base03 +" Cursor base03 red " verbatim " endif " endverbatim @@ -795,7 +795,7 @@ endif " verbatim " else " endverbatim -" Cursor orange base03 +" Cursor base03 orange " verbatim " endif " endverbatim @@ -811,7 +811,7 @@ endif " verbatim " else " endverbatim -" Cursor orange base03 +" Cursor base03 orange " verbatim " endif " endverbatim diff --git a/solarized8_light.colortemplate b/solarized8_light.colortemplate index 7bcccad..4ec29ab 100644 --- a/solarized8_light.colortemplate +++ b/solarized8_light.colortemplate @@ -111,7 +111,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor red base03 +Cursor base03 red verbatim endif endverbatim @@ -129,7 +129,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor orange base03 +Cursor base03 orange verbatim endif endverbatim @@ -147,7 +147,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor orange base03 +Cursor base03 orange verbatim endif endverbatim diff --git a/solarized8_light_flat.colortemplate b/solarized8_light_flat.colortemplate index 4def8ac..81a8c31 100644 --- a/solarized8_light_flat.colortemplate +++ b/solarized8_light_flat.colortemplate @@ -98,21 +98,6 @@ Background: light Normal base0 back ColorColumn none base02 Conceal blue none - -# Cursor style ============================================================== -verbatim -if get(g:, '@optionprefix_old_cursor_style', 0) -endverbatim -Cursor base03 base0 -verbatim -else -endverbatim -Cursor base3 blue -verbatim -endif -endverbatim -# --------------------------------------------------------------------------- - CursorColumn none base02 CursorLine none base03 underline s=base01 @@ -125,7 +110,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor red base03 +Cursor base03 red verbatim endif endverbatim @@ -142,7 +127,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor orange base03 +Cursor base03 orange verbatim endif endverbatim @@ -160,7 +145,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor orange base03 +Cursor base03 orange verbatim endif endverbatim diff --git a/solarized8_light_high.colortemplate b/solarized8_light_high.colortemplate index 9c3d1ff..3dad7d6 100644 --- a/solarized8_light_high.colortemplate +++ b/solarized8_light_high.colortemplate @@ -112,7 +112,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor red base03 +Cursor base03 red verbatim endif endverbatim @@ -130,7 +130,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor orange base03 +Cursor base03 orange verbatim endif endverbatim @@ -148,7 +148,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor orange base03 +Cursor base03 orange verbatim endif endverbatim diff --git a/solarized8_light_low.colortemplate b/solarized8_light_low.colortemplate index d3a2188..15f152c 100644 --- a/solarized8_light_low.colortemplate +++ b/solarized8_light_low.colortemplate @@ -111,7 +111,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor red base03 +Cursor base03 red verbatim endif endverbatim @@ -129,7 +129,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor orange base03 +Cursor base03 orange verbatim endif endverbatim @@ -147,7 +147,7 @@ Cursor base03 base0 verbatim else endverbatim -Cursor orange base03 +Cursor base03 orange verbatim endif endverbatim