From 509c9f68a90b6e1b7363a96f8452e723808b0db6 Mon Sep 17 00:00:00 2001
From: Bailey Ling <bling@live.ca>
Date: Tue, 13 Aug 2013 21:47:08 -0400
Subject: [PATCH] rename csv variables, add extensions section for doc

---
 autoload/airline/extensions.vim     |  5 ++---
 autoload/airline/extensions/csv.vim |  2 +-
 doc/airline.txt                     | 26 ++++++++++++++++----------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim
index fd6cabd0..1b3f45e1 100644
--- a/autoload/airline/extensions.vim
+++ b/autoload/airline/extensions.vim
@@ -130,11 +130,10 @@ function! airline#extensions#load()
     call airline#extensions#tagbar#init(s:ext)
   endif
 
-  if g:airline_enable_csv
-      call airline#extensions#csv#init(s:ext)
+  if g:airline_enable_csv && exists(':Table')
+    call airline#extensions#csv#init(s:ext)
   endif
 
-
   if exists(':VimShell')
     let s:filetype_overrides['vimshell'] = ['vimshell','%{vimshell#get_status_string()}']
     let s:filetype_regex_overrides['^int-'] = ['vimshell','%{substitute(&ft, "int-", "", "")}']
diff --git a/autoload/airline/extensions/csv.vim b/autoload/airline/extensions/csv.vim
index 7c90f1d9..57df1a5b 100644
--- a/autoload/airline/extensions/csv.vim
+++ b/autoload/airline/extensions/csv.vim
@@ -3,7 +3,7 @@
 
 function! airline#extensions#csv#get_statusline()
   if &ft ==# "csv" && exists("*CSV_WCol")
-    if exists("g:airline_filetype_csv") && g:airline_filetype_csv ==# 'Name'
+    if get(g:, 'airline#extensions#csv#column_identify', '') ==# 'Name'
       return '['.CSV_WCol('Name').CSV_WCol().']'
     else
       return '['.CSV_WCol().']'
diff --git a/doc/airline.txt b/doc/airline.txt
index cce5592a..f6a8101a 100644
--- a/doc/airline.txt
+++ b/doc/airline.txt
@@ -61,16 +61,6 @@ values):
 * enable/disable tagbar integration
 >
   let g:airline_enable_tagbar=1
-
-* enable/disable csv integration
->
-  let g:airline_enable_csv=1
-
-  (this displays the column number in the csv file)
-
-  let g:airline_filetype_csv = 'Name'
-
-  (this displays the column name)
 <
 
 * enable modified detection
@@ -205,6 +195,22 @@ sections which by default host more than one extension.
   let g:airline_section_c = '%t'
 <
 
+==============================================================================
+EXTENSIONS                                              *airline-extensions*
+
+                                                               *airline-csv*
+csv.vim <https://github.com/chrisbra/csv.vim>
+
+* enable/disable csv integration for displaying the current column number.
+>
+  let g:airline_enable_csv = 1
+>
+* change how columns are identified.
+>
+  let g:airline#extensions#csv#column_identify = '' (default)
+  let g:airline#extensions#csv#column_identify = 'Name' (extracts column name)
+>
+
 ==============================================================================
 FUNCREFS                                                  *airline-funcrefs*