From 00761b5ff6ff19b81b7e71605c55223c73d05508 Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Fri, 26 May 2017 11:18:48 +0200 Subject: [PATCH] Tweak cursor color in light themes. With normal and low visibility, now the cursor is orange (normal, high contrast variants) or grey (flat, low variants). With high visibility, now the cursor is red (normal high contrast variants) or (darker) grey (flat, low variants). --- colors/solarized8_dark.vim | 2 +- colors/solarized8_dark_flat.vim | 2 +- colors/solarized8_dark_high.vim | 2 +- colors/solarized8_dark_low.vim | 2 +- colors/solarized8_light.vim | 4 +++- colors/solarized8_light_flat.vim | 4 +++- colors/solarized8_light_high.vim | 4 +++- colors/solarized8_light_low.vim | 4 +++- src/solarized8.vim | 26 +++++++++++++++++--------- 9 files changed, 33 insertions(+), 17 deletions(-) diff --git a/colors/solarized8_dark.vim b/colors/solarized8_dark.vim index 491556d..e520d6b 100644 --- a/colors/solarized8_dark.vim +++ b/colors/solarized8_dark.vim @@ -34,6 +34,7 @@ hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642 +hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 if get(g:, "solarized_visibility", "") == "high" hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE @@ -117,7 +118,6 @@ hi! PmenuThumb ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 cterm=NONE,rever hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 guisp=#93a1a1 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 -hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 hi! link lCursor Cursor if has('nvim') hi! link TermCursor Cursor diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim index d4f097c..12ee639 100644 --- a/colors/solarized8_dark_flat.vim +++ b/colors/solarized8_dark_flat.vim @@ -30,6 +30,7 @@ hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642 +hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 if get(g:, "solarized_visibility", "") == "high" hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE @@ -115,7 +116,6 @@ hi! PmenuThumb ctermfg=10 guifg=#586e75 ctermbg=8 guibg=#002b36 cterm=NONE,rever hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 hi! CursorLine cterm=NONE,underline gui=NONE,underline ctermfg=NONE guifg=NONE ctermbg=8 guibg=#002b36 guisp=#586e75 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 -hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 hi! link lCursor Cursor if has('nvim') hi! link TermCursor Cursor diff --git a/colors/solarized8_dark_high.vim b/colors/solarized8_dark_high.vim index 53e5463..bf0201f 100644 --- a/colors/solarized8_dark_high.vim +++ b/colors/solarized8_dark_high.vim @@ -34,6 +34,7 @@ hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642 +hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 if get(g:, "solarized_visibility", "") == "high" hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE @@ -117,7 +118,6 @@ hi! PmenuThumb ctermfg=14 guifg=#93a1a1 ctermbg=8 guibg=#002b36 cterm=NONE,rever hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 guisp=#eee8d5 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 -hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 hi! link lCursor Cursor if has('nvim') hi! link TermCursor Cursor diff --git a/colors/solarized8_dark_low.vim b/colors/solarized8_dark_low.vim index c683532..61b60a7 100644 --- a/colors/solarized8_dark_low.vim +++ b/colors/solarized8_dark_low.vim @@ -34,6 +34,7 @@ hi! Ignore cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=0 guibg=#073642 +hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 if get(g:, "solarized_visibility", "") == "high" hi! SpecialKey cterm=NONE,reverse gui=NONE,reverse ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE @@ -117,7 +118,6 @@ hi! PmenuThumb ctermfg=12 guifg=#839496 ctermbg=8 guibg=#002b36 cterm=NONE,rever hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 hi! CursorLine cterm=NONE,underline gui=NONE,underline ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 guisp=#93a1a1 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=0 guibg=#073642 -hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 hi! link lCursor Cursor if has('nvim') hi! link TermCursor Cursor diff --git a/colors/solarized8_light.vim b/colors/solarized8_light.vim index bfaea5a..171ff6c 100644 --- a/colors/solarized8_light.vim +++ b/colors/solarized8_light.vim @@ -39,18 +39,21 @@ if get(g:, "solarized_visibility", "") == "high" hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=12 guibg=#839496 + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=1 guibg=#dc322f elseif get(g:, "solarized_visibility", "") == "low" hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5 + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 else hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5 + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 endif hi! NormalMode ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse @@ -119,7 +122,6 @@ hi! PmenuThumb ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reve hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 guisp=#586e75 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 -hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=1 guibg=#dc322f hi! link lCursor Cursor if has('nvim') hi! link TermCursor Cursor diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim index f22e2e6..48a1eca 100644 --- a/colors/solarized8_light_flat.vim +++ b/colors/solarized8_light_flat.vim @@ -35,18 +35,21 @@ if get(g:, "solarized_visibility", "") == "high" hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=9 guifg=#cb4b16 ctermbg=7 guibg=#eee8d5 + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=10 guibg=#586e75 elseif get(g:, "solarized_visibility", "") == "low" hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=7 guibg=#eee8d5 + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 else hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=7 guibg=#eee8d5 + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 endif if get(g:, "solarized_statusline", "") == "low" hi! NormalMode ctermfg=7 guifg=#eee8d5 ctermbg=10 guibg=#586e75 cterm=NONE,reverse,bold gui=NONE,reverse,bold @@ -117,7 +120,6 @@ hi! PmenuThumb ctermfg=12 guifg=#839496 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reve hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 hi! CursorLine cterm=NONE,underline gui=NONE,underline ctermfg=NONE guifg=NONE ctermbg=15 guibg=#fdf6e3 guisp=#93a1a1 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 -hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 hi! link lCursor Cursor if has('nvim') hi! link TermCursor Cursor diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim index 805558e..ca186c3 100644 --- a/colors/solarized8_light_high.vim +++ b/colors/solarized8_light_high.vim @@ -39,18 +39,21 @@ if get(g:, "solarized_visibility", "") == "high" hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=1 guibg=#dc322f elseif get(g:, "solarized_visibility", "") == "low" hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5 + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 else hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=7 guibg=#eee8d5 hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=10 guifg=#586e75 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5 + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 endif hi! NormalMode ctermfg=0 guifg=#073642 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse @@ -119,7 +122,6 @@ hi! PmenuThumb ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reve hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 hi! CursorLine cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 guisp=#073642 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 -hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=1 guibg=#dc322f hi! link lCursor Cursor if has('nvim') hi! link TermCursor Cursor diff --git a/colors/solarized8_light_low.vim b/colors/solarized8_light_low.vim index 25809c2..66838a7 100644 --- a/colors/solarized8_light_low.vim +++ b/colors/solarized8_light_low.vim @@ -39,18 +39,21 @@ if get(g:, "solarized_visibility", "") == "high" hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold,underline gui=NONE,bold,underline ctermfg=8 guifg=#002b36 ctermbg=NONE guibg=NONE + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=10 guibg=#586e75 elseif get(g:, "solarized_visibility", "") == "low" hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=7 guifg=#eee8d5 ctermbg=NONE guibg=NONE hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=8 guifg=#002b36 ctermbg=7 guibg=#eee8d5 + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 else hi! SpecialKey cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=7 guibg=#eee8d5 hi! NonText cterm=NONE,bold gui=NONE,bold ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE hi! CursorLineNr cterm=NONE,bold gui=NONE,bold ctermfg=11 guifg=#657b83 hi! Title cterm=NONE,bold gui=NONE,bold ctermfg=9 guifg=#cb4b16 ctermbg=NONE guibg=NONE hi! MatchParen cterm=NONE,bold gui=NONE,bold ctermfg=8 guifg=#002b36 ctermbg=7 guibg=#eee8d5 + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 endif hi! NormalMode ctermfg=10 guifg=#586e75 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse hi! InsertMode ctermfg=6 guifg=#2aa198 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reverse gui=NONE,reverse @@ -119,7 +122,6 @@ hi! PmenuThumb ctermfg=11 guifg=#657b83 ctermbg=15 guibg=#fdf6e3 cterm=NONE,reve hi! CursorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 hi! CursorLine cterm=NONE,underline gui=NONE,underline ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 guisp=#586e75 hi! ColorColumn cterm=NONE gui=NONE ctermfg=NONE guifg=NONE ctermbg=7 guibg=#eee8d5 -hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 hi! link lCursor Cursor if has('nvim') hi! link TermCursor Cursor diff --git a/src/solarized8.vim b/src/solarized8.vim index 0ec64e9..ad015b8 100644 --- a/src/solarized8.vim +++ b/src/solarized8.vim @@ -139,6 +139,7 @@ for s:solarized_background in ["dark", "light"] exe "let s:fmt_none = ' cterm=NONE gui=NONE" ."'" exe "let s:fmt_bold = ' cterm=NONE".s:b ." gui=NONE".s:b ."'" exe "let s:fmt_bldi = ' cterm=NONE".s:b ." gui=NONE".s:b ."'" + exe "let s:fmt_bldu = ' cterm=NONE,bold,underline gui=NONE,bold,underline'" exe "let s:fmt_undr = ' cterm=NONE".s:u ." gui=NONE".s:u ."'" exe "let s:fmt_undb = ' cterm=NONE".s:u.s:b ." gui=NONE".s:u.s:b ."'" exe "let s:fmt_undi = ' cterm=NONE".s:u ." gui=NONE".s:u ."'" @@ -273,6 +274,7 @@ for s:solarized_background in ["dark", "light"] " --------------------------------------------------------------------- if s:solarized_background ==# "dark" call s:put("hi! MatchParen" .s:fmt_bold .s:fg_base3 .s:bg_base02) + call s:put("hi! Cursor" .s:fmt_none .s:fg_base3 .s:bg_blue) endif " High visibility @@ -295,6 +297,11 @@ for s:solarized_background in ["dark", "light"] else call s:put(" hi! MatchParen" .s:fmt_bold .s:fg_base03 .s:bg_base00) endif + if s:solarized_contrast ==# "low" || s:solarized_contrast ==# "flat" + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base1) + else + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_red) + endif endif endif @@ -312,6 +319,11 @@ for s:solarized_background in ["dark", "light"] else call s:put(" hi! MatchParen" .s:fmt_bldu .s:fg_red .s:bg_base02) endif + if s:solarized_contrast ==# "low" || s:solarized_contrast ==# "flat" + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0) " As in the original Solarized + else + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_orange) + endif endif " Normal visibility @@ -332,6 +344,11 @@ for s:solarized_background in ["dark", "light"] else call s:put(" hi! MatchParen" .s:fmt_bldu .s:fg_red .s:bg_base02) endif + if s:solarized_contrast ==# "low" || s:solarized_contrast ==# "flat" + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0) " As in the original Solarized + else + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_orange) + endif endif call s:put('endif') " End visibility @@ -520,15 +537,6 @@ for s:solarized_background in ["dark", "light"] call s:put("hi! CursorLine" .s:fmt_uopt .s:fg_none .s:bg_base02 .s:sp_base1) endif call s:put("hi! ColorColumn" .s:fmt_none .s:fg_none .s:bg_base02) - if s:solarized_background == "dark" - call s:put("hi! Cursor" .s:fmt_none .s:fg_base3 .s:bg_blue) - else - if s:solarized_contrast == "low" || s:solarized_contrast == "flat" - call s:put("hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0) " As in the original Solarized - else - call s:put("hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_red) - endif - endif call s:put("hi! link lCursor Cursor") call s:put("if has('nvim')")