From e2d78bdded16f930872a4a978e5621f73da659bb Mon Sep 17 00:00:00 2001 From: Bailey Ling Date: Tue, 9 Jul 2013 11:48:11 +0000 Subject: [PATCH] Revert "use list of funcrecs, allowing window overrides to be dynamically added" This reverts commit c0427e435d2eb2170517438ddd4f0b5fa7a8b691. --- autoload/airline.vim | 4 +--- autoload/airline/extensions.vim | 8 ++++++-- plugin/airline.vim | 2 -- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/autoload/airline.vim b/autoload/airline.vim index 7e52f72c..d1f6c446 100644 --- a/autoload/airline.vim +++ b/autoload/airline.vim @@ -68,9 +68,7 @@ function! s:apply_window_overrides() let w:airline_section_c = bufname(winbufnr(winnr())) endif - for FuncRef in g:airline_window_override_funcrefs - call FuncRef() - endfor + call airline#extensions#apply_window_overrides() endfunction function! airline#update_externals() diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim index 5b7f0675..600d3ee4 100644 --- a/autoload/airline/extensions.vim +++ b/autoload/airline/extensions.vim @@ -10,8 +10,12 @@ function! airline#extensions#load() \ 'prog': 'airline#extensions#ctrlp#ctrlp_airline_status', \ } endif +endfunction - call add(g:airline_window_override_funcrefs, function('s:apply_window_overrides')) +function! s:empty_sections() + for section in s:sections + let w:airline_section_{section} = '' + endfor endfunction function! s:override_left_only(section1, section2) @@ -21,7 +25,7 @@ function! s:override_left_only(section1, section2) let w:airline_left_only = 1 endfunction -function! s:apply_window_overrides() +function! airline#extensions#apply_window_overrides() silent! unlet w:airline_left_only for section in s:sections silent! unlet w:airline_section_{section} diff --git a/plugin/airline.vim b/plugin/airline.vim index ebe3a5db..1827a775 100644 --- a/plugin/airline.vim +++ b/plugin/airline.vim @@ -50,8 +50,6 @@ function! s:init() endif endfunction -let g:airline_window_override_funcrefs = [] - augroup airline au! autocmd ColorScheme * call airline#highlight(['normal'])