Merge pull request #976 from tuopen/master

Fix issue when an airline theme and an external colorscheme have been defined
This commit is contained in:
Christian Brabandt 2016-01-30 20:45:59 +01:00
commit 31730c6ec8

View File

@ -21,7 +21,7 @@ function! s:init()
let g:airline_theme = 'dark'
let s:airline_theme_defined = 1
endif
if !airline#switch_matching_theme()
if s:airline_theme_defined || !airline#switch_matching_theme()
try
let palette = g:airline#themes#{g:airline_theme}#palette
catch