Merge branch 'dynamic'

This commit is contained in:
Bailey Ling
2013-08-17 22:39:24 +00:00
26 changed files with 350 additions and 376 deletions

View File

@@ -18,7 +18,7 @@ endfunction
function! airline#extensions#bufferline#init(ext)
highlight AlBl_active gui=bold cterm=bold term=bold
highlight link AlBl_inactive Al6
highlight link AlBl_inactive airline_c
let g:bufferline_inactive_highlight = 'AlBl_inactive'
let g:bufferline_active_highlight = 'AlBl_active'
let g:bufferline_active_buffer_left = ''

View File

@@ -5,7 +5,7 @@ if !exists('g:airline#extensions#csv#column_display')
let g:airline#extensions#csv#column_display = 'Number'
endif
function! airline#extensions#csv#get_statusline()
function! airline#extensions#csv#get_column()
if exists('*CSV_WCol')
if g:airline#extensions#csv#column_display ==# 'Name'
return '['.CSV_WCol('Name').CSV_WCol().']'
@@ -23,7 +23,7 @@ function! airline#extensions#csv#apply()
endif
let w:airline_section_gutter =
\ g:airline_left_alt_sep
\ .' %{airline#extensions#csv#get_statusline()}'
\ .' %{airline#extensions#csv#get_column()}'
\ .w:airline_section_gutter
endif
endfunction

View File

@@ -17,12 +17,12 @@ function! airline#extensions#ctrlp#load_theme()
let theme = g:airline#themes#{g:airline_theme}#ctrlp
else
let theme = airline#extensions#ctrlp#generate_color_map(
\ g:airline#themes#{g:airline_theme}#insert['statusline'],
\ g:airline#themes#{g:airline_theme}#insert['info'],
\ g:airline#themes#{g:airline_theme}#insert['mode'])
\ g:airline#themes#{g:airline_theme}#insert['airline_c'],
\ g:airline#themes#{g:airline_theme}#insert['airline_b'],
\ g:airline#themes#{g:airline_theme}#insert['airline_a'])
endif
for key in keys(theme)
call airline#exec_highlight(key, theme[key])
call airline#highlighter#exec(key, theme[key])
endfor
endfunction