1 files changed, 42 insertions, 36 deletions
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index a6fe45e..1c2c674 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -2,54 +2,60 @@
 " COLOR SCHEME:
 "=======================================================================================================================
 function! ExtendColorTheme()
-  highlight! Bold           cterm=bold                      gui=bold
+    highlight! Bold           cterm=bold                            gui=bold
-  highlight! Italic         cterm=italic                    gui=italic
+    highlight! Italic         cterm=italic                          gui=italic
-  highlight! Underline      cterm=underline                 gui=underline
+    highlight! Underline      cterm=underline                       gui=underline
-  highlight! BoldUnderline  cterm=bold,underline            gui=bold,underline
+    highlight! BoldUnderline  cterm=bold,underline                  gui=bold,underline
-  highlight! BoldItalic     cterm=bold,Italic               gui=Bold,Italic
+    highlight! BoldItalic     cterm=bold,Italic                     gui=bold,italic
-  highlight! Todo           cterm=bold                      gui=bold guibg=#ffffaa guifg=#000000
+    highlight! Todo           cterm=bold                            gui=bold            guibg=#ffffaa guifg=#000000
-  highlight! Error          cterm=NONE ctermbg=NONE            gui=NONE guibg=NONE
+    highlight! Error          cterm=NONE ctermbg=NONE               gui=NONE            guibg=NONE
-  highlight! SpellBad       cterm=NONE                      gui=undercurl guibg=NONE guifg=red
+    highlight! SpellBad       cterm=NONE                            gui=undercurl       guibg=NONE guifg=red
-  highlight! Ignore         cterm=NONE ctermbg=NONE ctermfg=NONE  gui=NONE guibg=NONE guifg=NONE
+    highlight! Ignore         cterm=NONE ctermbg=NONE ctermfg=NONE  gui=NONE            guibg=NONE guifg=NONE
-  highlight! Folded         cterm=NONE ctermbg=NONE
+    highlight! Folded         cterm=NONE ctermbg=NONE
-  let w:color=synIDattr(hlID("Normal"), "bg#")
+    
-  silent! exec 'highlight invisible gui=NONE guifg='.w:color.'guibg='.w:color.' cterm=NONE ctermfg='.w:color.' ctermbg='.w:color
+    if has("gui_running")
+        highlight invisible gui=NONE guifg=background guibg=background
+    else
+        let w:color=synIDtrans(synIDattr(hlID("Normal"), "bg"))
+        silent! exec 'highlight invisible cterm=NONE ctermfg='.w:color.' ctermbg='.w:color
+    endif
-  highlight! link           EndOfBuffer                     Invisible
+        highlight! link        EndOfBuffer    Invisible
-  highlight! link           qfSeparator                     Normal                                | " reserve one space
-  highlight! link           qfLineNr                        Normal                                | " informational line numbers should look different
-  highlight! link           SpecialKey                      NonText                               | " makes tab stop (see listchars) less disturbing
+    highlight! link        qfSeparator    Normal     | " reserve one space
-  highlight! link           WildMenu                        Search
+    highlight! link        qfLineNr       Normal     | " informational line numbers should look different
-  highlight! link           Convention                      Error
-  highlight! link           VertSplit                       LineNr
+    highlight! link        SpecialKey     NonText    | " makes tab stop (see listchars) less disturbing
-  highlight! link           SignColumn                      LineNr
+    highlight! link        WildMenu       Search
-  highlight! link           FoldColumn                      LineNr
+    highlight! link        Convention     Error
-  highlight! link           PmenuSbar                       Pmenu
+    highlight! link        VertSplit      LineNr
-  highlight! PmenuThumb     cterm=inverse
+    highlight! link        SignColumn     LineNr
-  highlight! MoreMsg        cterm=inverse
+    highlight! link        FoldColumn     LineNr
+    highlight! link        PmenuSbar      Pmenu
+    highlight! PmenuThumb  cterm=inverse
+    highlight! MoreMsg     cterm=inverse
 endfunction
 autocmd ColorScheme * call ExtendColorTheme()
-set background=light
+set background=dark
 if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))
-  let g:base16_shell_path  =  "~/.config/base16-shell/scripts"
+    let g:base16_shell_path  =  "~/.config/base16-shell/scripts"
-  let base16colorspace     =  256
+    let base16colorspace     =  256
-  source ~/.vimrc_background
+    source ~/.vimrc_background
 else
-  let g:PaperColor_Theme_Options = {
+    let g:PaperColor_Theme_Options = {
-        \   'theme': {
+                \   'theme': {
-        \     'default': {
+                \     'default': {
-        \       'transparent_background': 0
+                \       'transparent_background': 1
-        \     }
+                \     }
-        \   }
+                \   }
-        \ }
+                \ }
-  colorscheme PaperColor
+    colorscheme PaperColor
 endif

diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim index a6fe45e..1c2c674 100644 --- a/plugin/max-fix-colorschemes.vim +++ b/plugin/max-fix-colorschemes.vim
@@ -2,54 +2,60 @@
2	" COLOR SCHEME:	2	" COLOR SCHEME:
3	"=======================================================================================================================	3	"=======================================================================================================================
4	function! ExtendColorTheme()	4	function! ExtendColorTheme()
5	highlight! Bold cterm=bold gui=bold	5	highlight! Bold cterm=bold gui=bold
6	highlight! Italic cterm=italic gui=italic	6	highlight! Italic cterm=italic gui=italic
7	highlight! Underline cterm=underline gui=underline	7	highlight! Underline cterm=underline gui=underline
8	highlight! BoldUnderline cterm=bold,underline gui=bold,underline	8	highlight! BoldUnderline cterm=bold,underline gui=bold,underline
9	highlight! BoldItalic cterm=bold,Italic gui=Bold,Italic	9	highlight! BoldItalic cterm=bold,Italic gui=bold,italic
10	highlight! Todo cterm=bold gui=bold guibg=#ffffaa guifg=#000000	10	highlight! Todo cterm=bold gui=bold guibg=#ffffaa guifg=#000000
11	highlight! Error cterm=NONE ctermbg=NONE gui=NONE guibg=NONE	11	highlight! Error cterm=NONE ctermbg=NONE gui=NONE guibg=NONE
12	highlight! SpellBad cterm=NONE gui=undercurl guibg=NONE guifg=red	12	highlight! SpellBad cterm=NONE gui=undercurl guibg=NONE guifg=red
13	highlight! Ignore cterm=NONE ctermbg=NONE ctermfg=NONE gui=NONE guibg=NONE guifg=NONE	13	highlight! Ignore cterm=NONE ctermbg=NONE ctermfg=NONE gui=NONE guibg=NONE guifg=NONE
14	highlight! Folded cterm=NONE ctermbg=NONE	14	highlight! Folded cterm=NONE ctermbg=NONE
15		15
16		16
17		17
18	let w:color=synIDattr(hlID("Normal"), "bg#")	18
19	silent! exec 'highlight invisible gui=NONE guifg='.w:color.'guibg='.w:color.' cterm=NONE ctermfg='.w:color.' ctermbg='.w:color	19	if has("gui_running")
		20	highlight invisible gui=NONE guifg=background guibg=background
		21	else
		22	let w:color=synIDtrans(synIDattr(hlID("Normal"), "bg"))
		23	silent! exec 'highlight invisible cterm=NONE ctermfg='.w:color.' ctermbg='.w:color
		24	endif
20		25
21	highlight! link EndOfBuffer Invisible	26	highlight! link EndOfBuffer Invisible
22	highlight! link qfSeparator Normal \| " reserve one space
23	highlight! link qfLineNr Normal \| " informational line numbers should look different
24		27
25	highlight! link SpecialKey NonText \| " makes tab stop (see listchars) less disturbing	28	highlight! link qfSeparator Normal \| " reserve one space
26	highlight! link WildMenu Search	29	highlight! link qfLineNr Normal \| " informational line numbers should look different
27	highlight! link Convention Error
28		30
29	highlight! link VertSplit LineNr	31	highlight! link SpecialKey NonText \| " makes tab stop (see listchars) less disturbing
30	highlight! link SignColumn LineNr	32	highlight! link WildMenu Search
31	highlight! link FoldColumn LineNr	33	highlight! link Convention Error
32		34
33	highlight! link PmenuSbar Pmenu	35	highlight! link VertSplit LineNr
34	highlight! PmenuThumb cterm=inverse	36	highlight! link SignColumn LineNr
35	highlight! MoreMsg cterm=inverse	37	highlight! link FoldColumn LineNr
		38
		39	highlight! link PmenuSbar Pmenu
		40	highlight! PmenuThumb cterm=inverse
		41	highlight! MoreMsg cterm=inverse
36		42
37	endfunction	43	endfunction
38	autocmd ColorScheme * call ExtendColorTheme()	44	autocmd ColorScheme * call ExtendColorTheme()
39		45
40		46
41	set background=light	47	set background=dark
42	if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))	48	if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))
43	let g:base16_shell_path = "~/.config/base16-shell/scripts"	49	let g:base16_shell_path = "~/.config/base16-shell/scripts"
44	let base16colorspace = 256	50	let base16colorspace = 256
45	source ~/.vimrc_background	51	source ~/.vimrc_background
46	else	52	else
47	let g:PaperColor_Theme_Options = {	53	let g:PaperColor_Theme_Options = {
48	\ 'theme': {	54	\ 'theme': {
49	\ 'default': {	55	\ 'default': {
50	\ 'transparent_background': 0	56	\ 'transparent_background': 1
51	\ }	57	\ }
52	\ }	58	\ }
53	\ }	59	\ }
54	colorscheme PaperColor	60	colorscheme PaperColor
55	endif	61	endif