Merge branch 'master' into dev

This commit is contained in:
Bailey Ling 2013-09-01 18:55:46 +00:00
commit c994d08a6d

View File

@ -41,6 +41,7 @@ function! airline#init#bootstrap()
call s:check_defined('g:airline_theme_map', {}) call s:check_defined('g:airline_theme_map', {})
call extend(g:airline_theme_map, { call extend(g:airline_theme_map, {
\ 'Tomorrow.*': 'tomorrow', \ 'Tomorrow.*': 'tomorrow',
\ 'base16.*': 'base16',
\ 'mo[l|n]okai': 'molokai', \ 'mo[l|n]okai': 'molokai',
\ 'wombat.*': 'wombat', \ 'wombat.*': 'wombat',
\ '.*solarized.*': 'solarized', \ '.*solarized.*': 'solarized',