Merge branch 'hotfix/1.0.12.1'

* hotfix/1.0.12.1:
  Assign default GUI colors correctly
This commit is contained in:
Kim Silkebækken 2011-03-31 15:40:06 +02:00
commit ce13b9a485

View File

@ -17,7 +17,7 @@
endif endif
endfunction " }}} endfunction " }}}
function! s:InitHL(group, colors) " {{{ function! s:InitHL(group, colors) " {{{
let guihl = printf('guibg=%s guifg=#%s gui=%s', a:colors.gui[0], a:colors.gui[1], a:colors.gui[2]) let guihl = printf('guibg=%s guifg=%s gui=%s', a:colors.gui[0], a:colors.gui[1], a:colors.gui[2])
let ctermhl = &t_Co == 256 let ctermhl = &t_Co == 256
\ ? printf('ctermbg=%s ctermfg=%s cterm=%s', a:colors.cterm256[0], a:colors.cterm256[1], a:colors.cterm256[2]) \ ? printf('ctermbg=%s ctermfg=%s cterm=%s', a:colors.cterm256[0], a:colors.cterm256[1], a:colors.cterm256[2])
\ : printf('ctermbg=%s ctermfg=%s cterm=%s', a:colors.cterm[0], a:colors.cterm[1], a:colors.cterm[2]) \ : printf('ctermbg=%s ctermfg=%s cterm=%s', a:colors.cterm[0], a:colors.cterm[1], a:colors.cterm[2])
@ -33,13 +33,13 @@
" Init highlighting {{{ " Init highlighting {{{
let s:target_hl_defaults = { let s:target_hl_defaults = {
\ 'gui' : ['NONE', 'ff0000' , 'bold'] \ 'gui' : ['NONE', '#ff0000' , 'bold']
\ , 'cterm256': ['NONE', '196' , 'bold'] \ , 'cterm256': ['NONE', '196' , 'bold']
\ , 'cterm' : ['NONE', 'red' , 'bold'] \ , 'cterm' : ['NONE', 'red' , 'bold']
\ } \ }
let s:shade_hl_defaults = { let s:shade_hl_defaults = {
\ 'gui' : ['NONE', '585858' , 'NONE'] \ 'gui' : ['NONE', '#585858' , 'NONE']
\ , 'cterm256': ['NONE', '240' , 'NONE'] \ , 'cterm256': ['NONE', '240' , 'NONE']
\ , 'cterm' : ['NONE', 'darkgrey', 'NONE'] \ , 'cterm' : ['NONE', 'darkgrey', 'NONE']
\ } \ }