diff --git a/Readme.md b/Readme.md index 6d2a1f1..594a025 100644 --- a/Readme.md +++ b/Readme.md @@ -72,8 +72,11 @@ The following options were not available in the original Solarized: - `g:solarized_statusline`: one of `"normal"` (default) or `"low"`; - `g:solarized_term_italics`: set to `1` if your terminal supports italics (default is `0`). +- `g:solarized_old_cursor_style`: set to `1` if you want to use the original + Solarized's cursor style (default: `0`). By default, the cursor is orange/red + in light themes, and blue in dark themes. -These options may be used with any `solarized8_*` variant. +The options above may be used with any `solarized8_*` variant. ## Troubleshooting diff --git a/colors/solarized8_dark.vim b/colors/solarized8_dark.vim index 0e51f7b..a00911f 100644 --- a/colors/solarized8_dark.vim +++ b/colors/solarized8_dark.vim @@ -35,7 +35,11 @@ hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE gui hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE hi! link QuickFixLine Search 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_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=8 guifg=#002b36 ctermbg=12 guibg=#839496 +else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 +endif 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 diff --git a/colors/solarized8_dark_flat.vim b/colors/solarized8_dark_flat.vim index 1a8b0e7..d992c82 100644 --- a/colors/solarized8_dark_flat.vim +++ b/colors/solarized8_dark_flat.vim @@ -31,7 +31,11 @@ hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE gui hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE hi! link QuickFixLine Search 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_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=8 guifg=#002b36 ctermbg=12 guibg=#839496 +else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 +endif 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 diff --git a/colors/solarized8_dark_high.vim b/colors/solarized8_dark_high.vim index 1fc31a7..20a1193 100644 --- a/colors/solarized8_dark_high.vim +++ b/colors/solarized8_dark_high.vim @@ -35,7 +35,11 @@ hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE gui hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE hi! link QuickFixLine Search 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_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=8 guifg=#002b36 ctermbg=14 guibg=#93a1a1 +else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 +endif 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 diff --git a/colors/solarized8_dark_low.vim b/colors/solarized8_dark_low.vim index 90fa18b..97b38b3 100644 --- a/colors/solarized8_dark_low.vim +++ b/colors/solarized8_dark_low.vim @@ -35,7 +35,11 @@ hi! Error cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE gui hi! Todo cterm=NONE,bold gui=NONE,bold ctermfg=5 guifg=#d33682 ctermbg=NONE guibg=NONE hi! link QuickFixLine Search 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_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=8 guifg=#002b36 ctermbg=12 guibg=#839496 +else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=4 guibg=#268bd2 +endif 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 diff --git a/colors/solarized8_light.vim b/colors/solarized8_light.vim index 2de9eac..3d53fd7 100644 --- a/colors/solarized8_light.vim +++ b/colors/solarized8_light.vim @@ -40,21 +40,33 @@ 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=1 guibg=#dc322f + endif 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 + endif 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 + endif 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 diff --git a/colors/solarized8_light_flat.vim b/colors/solarized8_light_flat.vim index bf49461..182a151 100644 --- a/colors/solarized8_light_flat.vim +++ b/colors/solarized8_light_flat.vim @@ -36,21 +36,33 @@ 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=1 guibg=#dc322f + endif 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 + endif 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 + endif 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 diff --git a/colors/solarized8_light_high.vim b/colors/solarized8_light_high.vim index 300bf90..d63100e 100644 --- a/colors/solarized8_light_high.vim +++ b/colors/solarized8_light_high.vim @@ -40,21 +40,33 @@ 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=10 guibg=#586e75 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=1 guibg=#dc322f + endif 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=10 guibg=#586e75 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 + endif 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=10 guibg=#586e75 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 + endif 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 diff --git a/colors/solarized8_light_low.vim b/colors/solarized8_light_low.vim index 0106d7b..4ea4e65 100644 --- a/colors/solarized8_light_low.vim +++ b/colors/solarized8_light_low.vim @@ -40,21 +40,33 @@ 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=1 guibg=#dc322f + endif 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 + endif 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 + if get(g:, 'solarized_old_cursor_style', 0) + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=11 guibg=#657b83 + else + hi! Cursor cterm=NONE gui=NONE ctermfg=15 guifg=#fdf6e3 ctermbg=9 guibg=#cb4b16 + endif 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 diff --git a/src/solarized8.vim b/src/solarized8.vim index 0909a1f..6067dfc 100644 --- a/src/solarized8.vim +++ b/src/solarized8.vim @@ -275,7 +275,11 @@ 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) + call s:put("if get(g:, 'solarized_old_cursor_style', 0)") + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0) " As in original Solarized + call s:put("else") + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base3 .s:bg_blue) + call s:put("endif") endif " High visibility @@ -298,11 +302,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 + call s:put(" if get(g:, 'solarized_old_cursor_style', 0)") + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0) " As in original Solarized + call s:put(" else") + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_red) + call s:put(" endif") endif endif @@ -320,11 +324,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 + call s:put(" if get(g:, 'solarized_old_cursor_style', 0)") + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0) " As in original Solarized + call s:put(" else") + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_orange) + call s:put(" endif") endif " Normal visibility @@ -345,11 +349,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 + call s:put(" if get(g:, 'solarized_old_cursor_style', 0)") + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_base0) " As in original Solarized + call s:put(" else") + call s:put(" hi! Cursor" .s:fmt_none .s:fg_base03 .s:bg_orange) + call s:put(" endif") endif call s:put('endif') " End visibility