m-vim_plugins/gruvbox
1
0
Fork 0
mirror of https://github.com/morhetz/gruvbox.git synced 2025-11-14 06:13:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix guisp fallback

Browse Source
This commit is contained in:
Pavel Pertsev
2015-09-03 02:25:09 +03:00
parent 302470272b
commit 690b588378
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
colors/gruvbox.vim
View File

@@ -45,9 +45,9 @@ if !exists('g:gruvbox_inverse')
let g:gruvbox_inverse=1 let g:gruvbox_inverse=1
endif endif
" if !exists('g:gruvbox_guisp_fallback') || index(['fg', 'bg'], g:gruvbox_guisp_fallback) == -1 if !exists('g:gruvbox_guisp_fallback') || index(['fg', 'bg'], g:gruvbox_guisp_fallback) == -1
" let g:gruvbox_guisp_fallback='NONE' let g:gruvbox_guisp_fallback='fg'
" endif endif
if !exists('g:gruvbox_improved_strings') if !exists('g:gruvbox_improved_strings')
let g:gruvbox_improved_strings=0 let g:gruvbox_improved_strings=0
@@ -342,7 +342,7 @@ function! s:HL(group, fg, ...)
if type(a:fg) == 3 if type(a:fg) == 3
let fg = a:fg let fg = a:fg
elseif type(a:fg) == 1 elseif type(a:fg) == 1 && strlen(a:fg)
let fg = [a:fg, a:fg] let fg = [a:fg, a:fg]
else else
let fg = ['NONE', 'NONE'] let fg = ['NONE', 'NONE']
@@ -350,7 +350,7 @@ function! s:HL(group, fg, ...)
if a:0 >= 1 && type(a:1) == 3 if a:0 >= 1 && type(a:1) == 3
let bg = a:1 let bg = a:1
elseif a:0 >= 1 && type(a:1) == 1 elseif a:0 >= 1 && type(a:1) == 1 && strlen(a:1)
let bg = [a:1, a:1] let bg = [a:1, a:1]
else else
let bg = ['NONE', 'NONE'] let bg = ['NONE', 'NONE']
@@ -362,6 +362,14 @@ function! s:HL(group, fg, ...)
let emstr = 'NONE' let emstr = 'NONE'
endif endif
if a:0 >= 3
if g:gruvbox_guisp_fallback == 'fg' && type(a:3) == 3
let fg = a:3
elseif g:gruvbox_guisp_fallback == 'bg' && type(a:3) == 3
let bg = a:3
endif
endif
let histring = ['hi', a:group, let histring = ['hi', a:group,
\ 'guifg=' . fg[0], 'ctermfg=' . fg[1], \ 'guifg=' . fg[0], 'ctermfg=' . fg[1],
\ 'guibg=' . bg[0], 'ctermbg=' . bg[1], \ 'guibg=' . bg[0], 'ctermbg=' . bg[1],
@@ -371,7 +379,7 @@ function! s:HL(group, fg, ...)
if a:0 >= 3 if a:0 >= 3
if type(a:3) == 3 if type(a:3) == 3
let specl = a:3[0] let specl = a:3[0]
elseif type(a:3) == 1 elseif type(a:3) == 1 && strlen(a:3)
let specl = a:3 let specl = a:3
else else
let specl = 'NONE' let specl = 'NONE'
@@ -380,16 +388,6 @@ function! s:HL(group, fg, ...)
call add(histring, 'guisp=' . specl) call add(histring, 'guisp=' . specl)
endif endif
" if (Foreground override enabled) && ( We were passed a guisp value )
" if g:gruvbox_guisp_fallback == 'fg' && a:0 >= 3 && strlen(a:3) && a:3 != 'NONE'
" let c = get(s:gb, a:3)
" let histring .= 'guifg=#' . c[0] . ' ctermfg=' . c[1] . ' '
" if (Background override enabled) && ( We were passed a guisp value )
" if g:gruvbox_guisp_fallback == 'bg' && a:0 >= 3 && strlen(a:3) && a:3 != 'NONE'
" let c = get(s:gb, a:3)
" let histring .= 'guibg=#' . c[0] . ' ctermbg=' . c[1] . ' '
execute join(histring, ' ') execute join(histring, ' ')
endfunction endfunction