Add 'bold' value for g:solarized_diffmode.

Readme.md

@@ -65,7 +65,8 @@ Keep your `runtimepath` clean!
 The following options are inherited from Solarized:
 
 - `g:solarized_visibility`: one of `"normal"` (default), `"low"`, `"high"`;
-- `g:solarized_diffmode`: one of `"normal"` (default), `"low"`, `"high"`;
+- `g:solarized_diffmode`: one of `"normal"` (default), `"low"`, `"high"`,
+  `"bold"`;
 - `g:solarized_termtrans`: make terminal background transparent if set to `1`
   (default: `0`).
 

colors/solarized8_dark.vim

@@ -92,8 +92,7 @@ elseif get(g:, "solarized_diffmode", "") == "low"
   hi! DiffChange cterm=NONE gui=NONE ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
   hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE guisp=#268bd2
-else
+elseif get(g:, "solarized_diffmode", "") == "bold"
-  if has("gui_running")
     hi! DiffAdd cterm=NONE,bold gui=NONE,bold ctermfg=2 guifg=#719e07 ctermbg=0 guibg=#073642 guisp=#719e07
     hi! DiffChange cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=0 guibg=#073642 guisp=#b58900
     hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=0 guibg=#073642
@@ -104,7 +103,6 @@ else
   hi! DiffDelete cterm=NONE gui=NONE ctermfg=1 guifg=#dc322f ctermbg=0 guibg=#073642
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=0 guibg=#073642 guisp=#268bd2
 endif
-endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#d33682

colors/solarized8_dark_flat.vim

@@ -90,8 +90,7 @@ elseif get(g:, "solarized_diffmode", "") == "low"
   hi! DiffChange cterm=NONE gui=NONE ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
   hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE guisp=#268bd2
-else
+elseif get(g:, "solarized_diffmode", "") == "bold"
-  if has("gui_running")
     hi! DiffAdd cterm=NONE,bold gui=NONE,bold ctermfg=2 guifg=#719e07 ctermbg=0 guibg=#073642 guisp=#719e07
     hi! DiffChange cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=0 guibg=#073642 guisp=#b58900
     hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=0 guibg=#073642
@@ -102,7 +101,6 @@ else
   hi! DiffDelete cterm=NONE gui=NONE ctermfg=1 guifg=#dc322f ctermbg=0 guibg=#073642
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=0 guibg=#073642 guisp=#268bd2
 endif
-endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#d33682

colors/solarized8_dark_high.vim

@@ -92,8 +92,7 @@ elseif get(g:, "solarized_diffmode", "") == "low"
   hi! DiffChange cterm=NONE gui=NONE ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
   hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE guisp=#268bd2
-else
+elseif get(g:, "solarized_diffmode", "") == "bold"
-  if has("gui_running")
     hi! DiffAdd cterm=NONE,bold gui=NONE,bold ctermfg=2 guifg=#719e07 ctermbg=0 guibg=#073642 guisp=#719e07
     hi! DiffChange cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=0 guibg=#073642 guisp=#b58900
     hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=0 guibg=#073642
@@ -104,7 +103,6 @@ else
   hi! DiffDelete cterm=NONE gui=NONE ctermfg=1 guifg=#dc322f ctermbg=0 guibg=#073642
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=0 guibg=#073642 guisp=#268bd2
 endif
-endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=14 guifg=#93a1a1 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#d33682

colors/solarized8_dark_low.vim

@@ -92,8 +92,7 @@ elseif get(g:, "solarized_diffmode", "") == "low"
   hi! DiffChange cterm=NONE gui=NONE ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
   hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE guisp=#268bd2
-else
+elseif get(g:, "solarized_diffmode", "") == "bold"
-  if has("gui_running")
     hi! DiffAdd cterm=NONE,bold gui=NONE,bold ctermfg=2 guifg=#719e07 ctermbg=0 guibg=#073642 guisp=#719e07
     hi! DiffChange cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=0 guibg=#073642 guisp=#b58900
     hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=0 guibg=#073642
@@ -104,7 +103,6 @@ else
   hi! DiffDelete cterm=NONE gui=NONE ctermfg=1 guifg=#dc322f ctermbg=0 guibg=#073642
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=0 guibg=#073642 guisp=#268bd2
 endif
-endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=12 guifg=#839496 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#d33682

colors/solarized8_light.vim

@@ -92,8 +92,7 @@ elseif get(g:, "solarized_diffmode", "") == "low"
   hi! DiffChange cterm=NONE gui=NONE ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
   hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE guisp=#268bd2
-else
+elseif get(g:, "solarized_diffmode", "") == "bold"
-  if has("gui_running")
     hi! DiffAdd cterm=NONE,bold gui=NONE,bold ctermfg=2 guifg=#719e07 ctermbg=7 guibg=#eee8d5 guisp=#719e07
     hi! DiffChange cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=7 guibg=#eee8d5 guisp=#b58900
     hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
@@ -104,7 +103,6 @@ else
   hi! DiffDelete cterm=NONE gui=NONE ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=7 guibg=#eee8d5 guisp=#268bd2
 endif
-endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#dc322f

colors/solarized8_light_flat.vim

@@ -90,8 +90,7 @@ elseif get(g:, "solarized_diffmode", "") == "low"
   hi! DiffChange cterm=NONE gui=NONE ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
   hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE guisp=#268bd2
-else
+elseif get(g:, "solarized_diffmode", "") == "bold"
-  if has("gui_running")
     hi! DiffAdd cterm=NONE,bold gui=NONE,bold ctermfg=2 guifg=#719e07 ctermbg=7 guibg=#eee8d5 guisp=#719e07
     hi! DiffChange cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=7 guibg=#eee8d5 guisp=#b58900
     hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
@@ -102,7 +101,6 @@ else
   hi! DiffDelete cterm=NONE gui=NONE ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=7 guibg=#eee8d5 guisp=#268bd2
 endif
-endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#dc322f

colors/solarized8_light_high.vim

@@ -92,8 +92,7 @@ elseif get(g:, "solarized_diffmode", "") == "low"
   hi! DiffChange cterm=NONE gui=NONE ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
   hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE guisp=#268bd2
-else
+elseif get(g:, "solarized_diffmode", "") == "bold"
-  if has("gui_running")
     hi! DiffAdd cterm=NONE,bold gui=NONE,bold ctermfg=2 guifg=#719e07 ctermbg=7 guibg=#eee8d5 guisp=#719e07
     hi! DiffChange cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=7 guibg=#eee8d5 guisp=#b58900
     hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
@@ -104,7 +103,6 @@ else
   hi! DiffDelete cterm=NONE gui=NONE ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=7 guibg=#eee8d5 guisp=#268bd2
 endif
-endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=10 guifg=#586e75 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#dc322f

colors/solarized8_light_low.vim

@@ -92,8 +92,7 @@ elseif get(g:, "solarized_diffmode", "") == "low"
   hi! DiffChange cterm=NONE gui=NONE ctermfg=3 guifg=#b58900 ctermbg=NONE guibg=NONE guisp=#b58900
   hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=NONE guibg=NONE
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE guisp=#268bd2
-else
+elseif get(g:, "solarized_diffmode", "") == "bold"
-  if has("gui_running")
     hi! DiffAdd cterm=NONE,bold gui=NONE,bold ctermfg=2 guifg=#719e07 ctermbg=7 guibg=#eee8d5 guisp=#719e07
     hi! DiffChange cterm=NONE,bold gui=NONE,bold ctermfg=3 guifg=#b58900 ctermbg=7 guibg=#eee8d5 guisp=#b58900
     hi! DiffDelete cterm=NONE,bold gui=NONE,bold ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
@@ -104,7 +103,6 @@ else
   hi! DiffDelete cterm=NONE gui=NONE ctermfg=1 guifg=#dc322f ctermbg=7 guibg=#eee8d5
   hi! DiffText cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=7 guibg=#eee8d5 guisp=#268bd2
 endif
-endif
 hi! SignColumn cterm=NONE gui=NONE ctermfg=11 guifg=#657b83 ctermbg=NONE guibg=NONE
 hi! Conceal cterm=NONE gui=NONE ctermfg=4 guifg=#268bd2 ctermbg=NONE guibg=NONE
 hi! SpellBad cterm=NONE,undercurl gui=NONE,undercurl ctermfg=NONE guifg=NONE ctermbg=NONE guibg=NONE guisp=#dc322f

src/solarized8.vim

@@ -417,8 +417,7 @@ for s:solarized_background in ["dark", "light"]
     call s:put("  hi! DiffChange"     .s:fmt_undr   .s:fg_yellow .s:bg_none   .s:sp_yellow)
     call s:put("  hi! DiffDelete"     .s:fmt_bold   .s:fg_red    .s:bg_none)
     call s:put("  hi! DiffText"       .s:fmt_undr   .s:fg_blue   .s:bg_none   .s:sp_blue)
-    call s:put("else")
+    call s:put('elseif get(g:, "solarized_diffmode", "") == "bold"')
-    call s:put('  if has("gui_running")')
     call s:put("    hi! DiffAdd"        .s:fmt_bold   .s:fg_green  .s:bg_base02 .s:sp_green)
     call s:put("    hi! DiffChange"     .s:fmt_bold   .s:fg_yellow .s:bg_base02 .s:sp_yellow)
     call s:put("    hi! DiffDelete"     .s:fmt_bold   .s:fg_red    .s:bg_base02)
@@ -429,7 +428,6 @@ for s:solarized_background in ["dark", "light"]
     call s:put("  hi! DiffDelete"     .s:fmt_none   .s:fg_red    .s:bg_base02)
     call s:put("  hi! DiffText"       .s:fmt_none   .s:fg_blue   .s:bg_base02 .s:sp_blue)
     call s:put("endif")
-    call s:put("endif")
     " Changed by Lifepillar: set s:bg_none for SignColumn:
     call s:put("hi! SignColumn"     .s:fmt_none   .s:fg_base0  .s:bg_none)
     call s:put("hi! Conceal"        .s:fmt_none   .s:fg_blue   .s:bg_none)