tyler.durden
/
vim-airline
mirror of https://github.com/vim-airline/vim-airline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move getwinvar over

This commit is contained in:
Bailey Ling 2013-08-16 01:50:24 +00:00
parent 0e936d0b9a
commit 30adb973fc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autoload/airline.vim
View File

@ -61,14 +61,8 @@ function! airline#highlight(modes)
endfor endfor
endfunction endfunction
" for 7.2 compatibility
function! s:getwinvar(winnr, key, ...)
let winvals = getwinvar(a:winnr, '')
return get(winvals, a:key, (a:0 ? a:1 : ''))
endfunction
function! s:get_section(winnr, key, ...) function! s:get_section(winnr, key, ...)
let text = s:getwinvar(a:winnr, 'airline_section_'.a:key, g:airline_section_{a:key}) let text = airline#util#getwinvar(a:winnr, 'airline_section_'.a:key, g:airline_section_{a:key})
let [prefix, suffix] = [get(a:000, 0, '%( '), get(a:000, 1, ' %)')] let [prefix, suffix] = [get(a:000, 0, '%( '), get(a:000, 1, ' %)')]
return empty(text) ? '' : prefix.text.suffix return empty(text) ? '' : prefix.text.suffix
endfunction endfunction
@ -76,7 +70,7 @@ endfunction
function! airline#get_statusline(winnr, active) function! airline#get_statusline(winnr, active)
let builder = airline#builder#new(a:active) let builder = airline#builder#new(a:active)
if s:getwinvar(a:winnr, 'airline_render_left', a:active || (!a:active && !g:airline_inactive_collapse)) if airline#util#getwinvar(a:winnr, 'airline_render_left', a:active || (!a:active && !g:airline_inactive_collapse))
call builder.add_section('Al2', s:get_section(a:winnr, 'a').'%{g:airline_detect_paste && &paste ? g:airline_paste_symbol." " : ""}') call builder.add_section('Al2', s:get_section(a:winnr, 'a').'%{g:airline_detect_paste && &paste ? g:airline_paste_symbol." " : ""}')
call builder.add_section('Al4', s:get_section(a:winnr, 'b')) call builder.add_section('Al4', s:get_section(a:winnr, 'b'))
call builder.add_section('Al6', s:get_section(a:winnr, 'c').' %#Al7#%{&ro ? g:airline_readonly_symbol : ""}') call builder.add_section('Al6', s:get_section(a:winnr, 'c').' %#Al7#%{&ro ? g:airline_readonly_symbol : ""}')
@ -84,7 +78,7 @@ function! airline#get_statusline(winnr, active)
call builder.add_section('Al6', '%f%m') call builder.add_section('Al6', '%f%m')
endif endif
call builder.split(s:get_section(a:winnr, 'gutter', '', '')) call builder.split(s:get_section(a:winnr, 'gutter', '', ''))
if s:getwinvar(a:winnr, 'airline_render_right', 1) if airline#util#getwinvar(a:winnr, 'airline_render_right', 1)
call builder.add_section('Al6', s:get_section(a:winnr, 'x')) call builder.add_section('Al6', s:get_section(a:winnr, 'x'))
call builder.add_section('Al4', s:get_section(a:winnr, 'y')) call builder.add_section('Al4', s:get_section(a:winnr, 'y'))
call builder.add_section('Al2', s:get_section(a:winnr, 'z')) call builder.add_section('Al2', s:get_section(a:winnr, 'z'))

6
autoload/airline/util.vim
View File

@ -1,6 +1,12 @@
" MIT license. Copyright (c) 2013 Bailey Ling. " MIT license. Copyright (c) 2013 Bailey Ling.
" vim: ts=2 sts=2 sw=2 fdm=indent " vim: ts=2 sts=2 sw=2 fdm=indent
" for 7.2 compatibility
function! airline#util#getwinvar(winnr, key, ...)
let winvals = getwinvar(a:winnr, '')
return get(winvals, a:key, (a:0 ? a:1 : ''))
endfunction
function! airline#util#exec_funcrefs(list, break_early) function! airline#util#exec_funcrefs(list, break_early)
" for 7.2; we cannot iterate list, hence why we use range() " for 7.2; we cannot iterate list, hence why we use range()
" for 7.3-[97, 328]; we cannot reuse the variable, hence the {} " for 7.3-[97, 328]; we cannot reuse the variable, hence the {}