From f66cb47d291c0d8e0ee1e78a92143e54155cfa05 Mon Sep 17 00:00:00 2001 From: Bailey Ling Date: Tue, 13 Aug 2013 21:52:31 -0400 Subject: [PATCH] fix up csv integration so it only applies to csv filetypes --- autoload/airline/extensions/csv.vim | 16 +++++++++------- doc/airline.txt | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/autoload/airline/extensions/csv.vim b/autoload/airline/extensions/csv.vim index 57df1a5b..baa0c6e0 100644 --- a/autoload/airline/extensions/csv.vim +++ b/autoload/airline/extensions/csv.vim @@ -1,20 +1,22 @@ " MIT license. Copyright (c) 2013 Bailey Ling. " vim: ts=2 sts=2 sw=2 fdm=indent -function! airline#extensions#csv#get_statusline() +function! airline#extensions#csv#apply() if &ft ==# "csv" && exists("*CSV_WCol") if get(g:, 'airline#extensions#csv#column_identify', '') ==# 'Name' - return '['.CSV_WCol('Name').CSV_WCol().']' + let column = '['.CSV_WCol('Name').CSV_WCol().']' else - return '['.CSV_WCol().']' + let column = '['.CSV_WCol().']' endif - else - return '' + + if !exists('w:airline_section_gutter') + let w:airline_section_gutter = '' + endif + let w:airline_section_gutter .= g:airline_left_alt_sep.' '.column endif endfunction function! airline#extensions#csv#init(ext) - call a:ext.add_statusline_funcref(function('airline#extensions#csv#get_statusline')) - let g:airline_section_c .= ' '.g:airline_left_alt_sep.' %{airline#extensions#csv#get_statusline()}' + call a:ext.add_statusline_funcref(function('airline#extensions#csv#apply')) endfunction diff --git a/doc/airline.txt b/doc/airline.txt index f6a8101a..085d435d 100644 --- a/doc/airline.txt +++ b/doc/airline.txt @@ -183,7 +183,7 @@ sections which by default host more than one extension. let g:airline_section_a (the mode/paste indicator) let g:airline_section_b (the fugitive/lawrencium branch indicator) let g:airline_section_c (bufferline or filename) - let g:airline_section_gutter + let g:airline_section_gutter (csv) let g:airline_section_x (tagbar, filetype) let g:airline_section_y (fileencoding, fileformat) let g:airline_section_z (percentage, line number, column number)