support for conditional parts. resolves #238.

add the old type of 'simple' theme and change the name of it to 'serene'

.gitignore

@@ -1 +1,3 @@
 doc/tags
+*.lock
+.vim-flavor

.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+script: rake ci

Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'vim-flavor', '~> 1.1'

README.md

@@ -1,58 +1,88 @@
-# vim-airline
+# vim-airline [![Build Status](https://travis-ci.org/bling/vim-airline.png)](https://travis-ci.org/bling/vim-airline)
 
-Lean & mean statusline for vim that's light as air.
+Lean & mean status/tabline for vim that's light as air.
 
 ![img](https://github.com/bling/vim-airline/wiki/screenshots/demo.gif)
 
 # Features
 
-*  tiny core written with extensibility in mind ([open/closed principle][8]).
-*  integrates with a variety of plugins, including: [vim-bufferline][6], [fugitive][4], [unite][9], [ctrlp][10], [minibufexpl][15], [gundo][16], [undotree][17], [nerdtree][18], [tagbar][19], [vim-gitgutter][29], [vim-signify][30], [syntastic][5], [lawrencium][21] and [virtualenv][31]
-*  looks good with regular fonts and provides configuration points so you can use unicode or powerline symbols.
-*  optimized for speed; it loads in under a millisecond.
-*  extensive suite of themes for popular colorschemes including [solarized][23] (dark and light), [tomorrow][24] (all variants), [base16][32] (all variants), [molokai][25], [jellybeans][26] and others; have a look at the [screenshots][14] in the wiki.
-*  supports 7.2 as the minimum Vim version
+*  Tiny core written with extensibility in mind ([open/closed principle][8]).
+*  Integrates with a variety of plugins, including: [vim-bufferline][6], [fugitive][4], [unite][9], [ctrlp][10], [minibufexpl][15], [gundo][16], [undotree][17], [nerdtree][18], [tagbar][19], [vim-gitgutter][29], [vim-signify][30], [syntastic][5], [lawrencium][21] and [virtualenv][31].
+*  Looks good with regular fonts and provides configuration points so you can use unicode or powerline symbols.
+*  Optimized for speed; it loads in under a millisecond.
+*  Extensive suite of themes for popular colorschemes including [solarized][23] (dark and light), [tomorrow][24] (all variants), [base16][32] (all variants), [molokai][25], [jellybeans][26] and others; have a look at the [screenshots][14] in the wiki.
+*  Supports 7.2 as the minimum Vim version.
+*  Stable release cycle; bleeding edge changes happen on the `dev` branch, and after they have gone through a [full regression test][33] will eventually be merged in the stable master branch.  Releases typically occur every 2 weeks.
+*  Unit testing suite.
 
-# Straightforward customization
+## Straightforward customization
 
-If you don't like the defaults, you can replace all sections with standard `statusline` syntax.
+If you don't like the defaults, you can replace all sections with standard `statusline` syntax.  Give your statusline that you've built over the years a face lift.
 
 ![image](https://f.cloud.github.com/assets/306502/1009429/d69306da-0b38-11e3-94bf-7c6e3eef41e9.png)
 
-# Extensible pipeline
+## Automatic truncation
 
-Completely transform the statusline to your liking.
+Sections and parts within sections can be configured to automatically hide when the window size shrinks.
 
-![allyourbase](https://f.cloud.github.com/assets/306502/1022714/e150034a-0da7-11e3-94a5-ca9d58a297e8.png)
+![image](https://f.cloud.github.com/assets/306502/1060831/05c08aac-11bc-11e3-8470-a506a3037f45.png)
 
-# Integration with external plugins
+## Smarter tab line
 
-vim-airline provides seamless integration with a variety of plugins.  These extensions will be lazily loaded if and only if you have the other plugins installed (and of course you can turn them off if you don't like it).
+Automatically displays all buffers when there's only one tab open.
 
-### [ctrlp.vim][10]
+![tabline](https://f.cloud.github.com/assets/306502/1072623/44c292a0-1495-11e3-9ce6-dcada3f1c536.gif)
+
+This is disabled by default; add the following to your vimrc to enable the extension:
+
+    let g:airline#extensions#tabline#enabled = 1
+
+## Seamless integration
+
+vim-airline integrates with a variety of plugins out of the box.  These extensions will be lazily loaded if and only if you have the other plugins installed (and of course you can turn them off).
+
+#### [ctrlp.vim][10]
 ![image](https://f.cloud.github.com/assets/306502/962258/7345a224-04ec-11e3-8b5a-f11724a47437.png)
 
-### [unite.vim][9]
+#### [unite.vim][9]
 ![image](https://f.cloud.github.com/assets/306502/962319/4d7d3a7e-04ed-11e3-9d59-ab29cb310ff8.png)
 
-### [tagbar][19]
+#### [tagbar][19]
 ![image](https://f.cloud.github.com/assets/306502/962150/7e7bfae6-04ea-11e3-9e28-32af206aed80.png)
 
-### [csv.vim][28]
+#### [csv.vim][28]
 ![image](https://f.cloud.github.com/assets/306502/962204/cfc1210a-04eb-11e3-8a93-42e6bcd21efa.png)
 
-### [syntastic][5]
+#### [syntastic][5]
 ![image](https://f.cloud.github.com/assets/306502/962864/9824c484-04f7-11e3-9928-da94f8c7da5a.png)
 
-### whitespace
-![image](https://f.cloud.github.com/assets/306502/962401/2a75385e-04ef-11e3-935c-e3b9f0e954cc.png)
-
-### hunks ([vim-gitgutter][29] & [vim-signify][30])
+#### hunks ([vim-gitgutter][29] & [vim-signify][30])
 ![image](https://f.cloud.github.com/assets/306502/995185/73fc7054-09b9-11e3-9d45-618406c6ed98.png)
 
-### [virtualenv][31]
+#### [virtualenv][31]
 ![image](https://f.cloud.github.com/assets/390964/1022566/cf81f830-0d98-11e3-904f-cf4fe3ce201e.png)
 
+## Extras
+
+vim-airline also supplies some supplementary stand-alone extensions.  In addition to the tabline extension mentioned earlier, there is also:
+
+#### whitespace
+![image](https://f.cloud.github.com/assets/306502/962401/2a75385e-04ef-11e3-935c-e3b9f0e954cc.png)
+
+## Configurable and extensible
+
+#### Fine-tuned configuration
+
+Every section is composed of parts, and you can reorder and reconfigure them at will.
+
+![image](https://f.cloud.github.com/assets/306502/1073278/f291dd4c-14a3-11e3-8a83-268e2753f97d.png)
+
+#### Extensible pipeline
+
+Completely transform the statusline to your liking.  Build out the statusline as you see fit by extracting colors from the current colorscheme's highlight groups.
+
+![allyourbase](https://f.cloud.github.com/assets/306502/1022714/e150034a-0da7-11e3-94a5-ca9d58a297e8.png)
+
 # Rationale
 
 There's already [powerline][2], why yet another statusline?
@@ -61,9 +91,7 @@ There's already [powerline][2], why yet another statusline?
 
 What about [vim-powerline][1]?
 
-*  the author has been active developing powerline, which was rewritten in python and expands its capabilities to tools outside of Vim, such as bash, zsh, and tmux.
-*  vim-powerline has been deprecated as a result, and no features will be added to it.
-*  vim-powerline uses different font codes, so if you want to use it with a powerline themed tmux (for example), it will not work.
+*  vim-powerline has been deprecated in favor of the newer, unifying powerline, which is under active development; the new version is written in python at the core and exposes various bindings such that it can style statuslines not only in vim, but also tmux, bash, zsh, and others.
 
 # Where did the name come from?
 
@@ -92,7 +120,7 @@ This plugin follows the standard runtime path structure, and as such it can be i
 
 For the nice looking powerline symbols to appear, you will need to install a patched font.  Instructions can be found in the official powerline [documentation][20].  Prepatched fonts can be found in the [powerline-fonts][3] repository.
 
-Finally, enable them in vim-airline by adding `let g:airline_powerline_fonts = 1` to your vimrc.
+Finally, you can add the convenience variable `let g:airline_powerline_fonts = 1` to your vimrc which will automatically populate the `g:airline_symbols` dictionary with the powerline symbols.
 
 # FAQ
 
@@ -106,18 +134,18 @@ A full list of screenshots for various themes can be found in the [Wiki][14].
 
 Tracking down bugs can take a very long time due to different configurations, versions, and operating systems.  To ensure a timely response, please help me out by doing the following:
 
-*  reproduce it with this [minivimrc][7] repository to rule out any configuration conflicts.
-*  a link to your vimrc or a gist which shows how you configured the plugin(s).
-*  and so I can reproduce; your `:version` of vim, and the commit of vim-airline you're using.
+*  Reproduce it with this [minivimrc][7] repository to rule out any configuration conflicts.
+*  A link to your vimrc or a gist which shows how you configured the plugin(s).
+*  And so I can reproduce; your `:version` of vim, and the commit of vim-airline you're using.
 
 # Contributions
 
 Contributions and pull requests are welcome.  Please take note of the following guidelines:
 
-*  adhere to the existing style as much as possible; notably, 2 space indents and long-form keywords.
-*  keep the history clean! squash your branches before you submit a pull request. `pull --rebase` is your friend.
-*  any changes to the core should be tested against Vim 7.2.
-*  if you submit a theme, please create a screenshot so it can be added to the [Wiki][14].
+*  Adhere to the existing style as much as possible; notably, 2 space indents and long-form keywords.
+*  Keep the history clean! squash your branches before you submit a pull request. `pull --rebase` is your friend.
+*  Any changes to the core should be tested against Vim 7.2.
+*  If you submit a theme, please create a screenshot so it can be added to the [Wiki][14].
 
 # License
 
@@ -158,3 +186,4 @@ MIT License. Copyright (c) 2013 Bailey Ling.
 [30]: https://github.com/mhinz/vim-signify
 [31]: https://github.com/jmcantrell/vim-virtualenv
 [32]: https://github.com/chriskempson/base16-vim
+[33]: https://github.com/bling/vim-airline/wiki/Test-Plan

Rakefile

@@ -0,0 +1,14 @@
+#!/usr/bin/env rake
+
+task :default => [:test]
+
+task :ci => [:dump, :test]
+
+task :dump do
+  sh 'vim --version'
+end
+
+task :test do
+  sh 'bundle exec vim-flavor test'
+end
+

autoload/airline.vim

@@ -26,7 +26,6 @@ function! airline#add_inactive_statusline_func(name)
 endfunction
 
 function! airline#load_theme()
-  highlight! default link airline_warningmsg WarningMsg
   call airline#highlighter#load_theme()
   call airline#extensions#load_theme()
 endfunction
@@ -44,63 +43,30 @@ function! airline#switch_theme(name)
   let w:airline_lastmode = ''
   call airline#update_statusline()
   call airline#load_theme()
-  call airline#check_mode()
 endfunction
 
 function! airline#switch_matching_theme()
   if exists('g:colors_name')
-    let v:errmsg = ''
-    silent! let palette = g:airline#themes#{g:colors_name}#palette
-    if empty(v:errmsg)
+    try
+      let palette = g:airline#themes#{g:colors_name}#palette
       call airline#switch_theme(g:colors_name)
       return 1
-    else
+    catch
       for map in items(g:airline_theme_map)
         if match(g:colors_name, map[0]) > -1
           call airline#switch_theme(map[1])
           return 1
         endif
       endfor
-    endif
+    endtry
   endif
   return 0
 endfunction
 
-function! s:get_section(winnr, 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, ' %)')]
-  return empty(text) ? '' : prefix.text.suffix
-endfunction
-
-function! airline#get_statusline(builder, winnr, active)
-  if airline#util#getwinvar(a:winnr, 'airline_render_left', a:active || (!a:active && !g:airline_inactive_collapse))
-    call a:builder.add_section('airline_a', s:get_section(a:winnr, 'a'))
-    call a:builder.add_section('airline_b', s:get_section(a:winnr, 'b'))
-    call a:builder.add_section('airline_c', '%<'.s:get_section(a:winnr, 'c'))
-  else
-    call a:builder.add_section('airline_c', '%f%m')
-  endif
-
-  call a:builder.split(s:get_section(a:winnr, 'gutter', '', ''))
-
-  if airline#util#getwinvar(a:winnr, 'airline_render_right', 1)
-    call a:builder.add_section('airline_x', s:get_section(a:winnr, 'x'))
-    call a:builder.add_section('airline_y', s:get_section(a:winnr, 'y'))
-    call a:builder.add_section('airline_z', s:get_section(a:winnr, 'z'))
-    if a:active
-      call a:builder.add_raw('%(')
-      call a:builder.add_section('airline_warningmsg', s:get_section(a:winnr, 'warning', '', ''))
-      call a:builder.add_raw('%)')
-    endif
-  endif
-
-  return a:builder.build()
-endfunction
-
 function! airline#update_statusline()
   for nr in filter(range(1, winnr('$')), 'v:val != winnr()')
     call setwinvar(nr, 'airline_active', 0)
-    let context = { 'winnr': nr, 'active': 0 }
+    let context = { 'winnr': nr, 'active': 0, 'bufnr': winbufnr(nr) }
     call s:invoke_funcrefs(context, s:inactive_funcrefs)
   endfor
 
@@ -111,21 +77,31 @@ function! airline#update_statusline()
   endfor
 
   let w:airline_active = 1
-  let context = { 'winnr': winnr(), 'active': 1 }
+  let context = { 'winnr': winnr(), 'active': 1, 'bufnr': winbufnr(winnr()) }
   call s:invoke_funcrefs(context, g:airline_statusline_funcrefs)
 endfunction
 
+let s:contexts = {}
+let s:core_funcrefs = [
+      \ function('airline#extensions#apply'),
+      \ function('airline#extensions#default#apply') ]
 function! s:invoke_funcrefs(context, funcrefs)
   let builder = airline#builder#new(a:context)
-  let err = airline#util#exec_funcrefs(a:funcrefs, builder, a:context)
-  if err == 0
-    call setwinvar(a:context.winnr, '&statusline', airline#get_statusline(builder, a:context.winnr, a:context.active))
-  elseif err == 1
-    call setwinvar(a:context.winnr, '&statusline', builder.build())
+  let err = airline#util#exec_funcrefs(a:funcrefs + s:core_funcrefs, builder, a:context)
+  if err == 1
+    let a:context.line = builder.build()
+    let s:contexts[a:context.winnr] = a:context
+    call setwinvar(a:context.winnr, '&statusline', '%!airline#statusline('.a:context.winnr.')')
   endif
 endfunction
 
-function! airline#check_mode()
+function! airline#statusline(winnr)
+  return '%{airline#check_mode('.a:winnr.')}'.s:contexts[a:winnr].line
+endfunction
+
+function! airline#check_mode(winnr)
+  let context = s:contexts[a:winnr]
+
   if get(w:, 'airline_active', 1)
     let l:m = mode()
     if l:m ==# "i"
@@ -143,18 +119,23 @@ function! airline#check_mode()
     let w:airline_current_mode = get(g:airline_mode_map, '__')
   endif
 
-  if g:airline_detect_modified && &modified
-    call add(l:mode, 'modified')
+  if g:airline_detect_modified
+    if &modified
+      call add(l:mode, 'modified')
+    endif
   endif
+
   if g:airline_detect_paste && &paste
     call add(l:mode, 'paste')
   endif
 
   let mode_string = join(l:mode)
   if get(w:, 'airline_lastmode', '') != mode_string
+    call airline#highlighter#highlight_modified_inactive(context.bufnr)
     call airline#highlighter#highlight(l:mode)
     let w:airline_lastmode = mode_string
   endif
+
   return ''
 endfunction
 

autoload/airline/builder.vim

@@ -11,15 +11,19 @@ endfunction
 function! s:prototype.add_section(group, contents)
   if self._curgroup != ''
     if self._curgroup == a:group
-      let self._line .= self._side ? g:airline_left_alt_sep : g:airline_right_alt_sep
+      let self._line .= self._side ? self._context.left_alt_sep : self._context.right_alt_sep
     else
       call airline#highlighter#add_separator(self._curgroup, a:group, self._side)
       let self._line .= '%#'.self._curgroup.'_to_'.a:group.'#'
-      let self._line .= self._side ? g:airline_left_sep : g:airline_right_sep
+      let self._line .= self._side ? self._context.left_sep : self._context.right_sep
     endif
   endif
 
-  let self._line .= '%#'.a:group.'#'.a:contents
+  if self._curgroup != a:group
+    let self._line .= '%#'.a:group.'#'
+  endif
+
+  let self._line .= a:contents
   let self._curgroup = a:group
 endfunction
 
@@ -39,7 +43,14 @@ function! airline#builder#new(context)
   let builder._context = a:context
   let builder._side = 1
   let builder._curgroup = ''
-  let builder._line = '%{airline#check_mode()}'
+  let builder._line = ''
+
+  call extend(builder._context, {
+        \ 'left_sep': g:airline_left_sep,
+        \ 'left_alt_sep': g:airline_left_alt_sep,
+        \ 'right_sep': g:airline_right_sep,
+        \ 'right_alt_sep': g:airline_right_alt_sep,
+        \ }, 'keep')
   return builder
 endfunction
 

autoload/airline/debug.vim

@@ -32,3 +32,19 @@ function! airline#debug#profile2()
   noautocmd qall!
 endfunction
 
+function! airline#debug#profile3()
+  profile start airline-profile-mode.log
+  profile func *
+  profile file *
+
+  for i in range(1000)
+    startinsert
+    redrawstatus
+    stopinsert
+    redrawstatus
+  endfor
+
+  profile pause
+  noautocmd qall!
+endfunction
+

autoload/airline/deprecation.vim

@@ -0,0 +1,31 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+function! airline#deprecation#check()
+  if exists('g:airline_enable_fugitive') || exists('g:airline_fugitive_prefix')
+    echom 'The g:airline_enable_fugitive and g:airline_fugitive_prefix variables are obsolete. Please read the documentation about the branch extension.'
+  endif
+
+  let tests = [
+        \ [ 'g:airline_paste_symbol', 'g:airline_symbols.paste' ],
+        \ [ 'g:airline_readonly_symbol', 'g:airline_symbols.readonly' ],
+        \ [ 'g:airline_linecolumn_prefix', 'g:airline_symbols.linenr' ],
+        \ [ 'g:airline_branch_prefix', 'g:airline_symbols.branch' ],
+        \ [ 'g:airline_branch_empty_message', 'g:airline#extensions#branch#empty_message' ],
+        \ [ 'g:airline_detect_whitespace', 'g:airline#extensions#whitespace#enabled|show_message' ],
+        \ [ 'g:airline_enable_hunks', 'g:airline#extensions#hunks#enabled' ],
+        \ [ 'g:airline_enable_tagbar', 'g:airline#extensions#tagbar#enabled' ],
+        \ [ 'g:airline_enable_csv', 'g:airline#extensions#csv#enabled' ],
+        \ [ 'g:airline_enable_branch', 'g:airline#extensions#branch#enabled' ],
+        \ [ 'g:airline_enable_bufferline', 'g:airline#extensions#bufferline#enabled' ],
+        \ [ 'g:airline_enable_syntastic', 'g:airline#extensions#syntastic#enabled' ],
+        \ ]
+  for test in tests
+    if exists(test[0])
+      let max = winwidth(0) - 16
+      let msg = printf('The variable %s is deprecated and may not work in the future. It has been replaced with %s. Please read the documentation.', test[0], test[1])
+      echom msg[:max].'...'
+    endif
+  endfor
+endfunction
+

autoload/airline/extensions.vim

@@ -2,6 +2,8 @@
 " vim: et ts=2 sts=2 sw=2
 
 let s:ext = {}
+let s:ext._theme_funcrefs = []
+
 function! s:ext.add_statusline_func(name) dict
   call airline#add_statusline_func(a:name)
 endfunction
@@ -11,8 +13,11 @@ endfunction
 function! s:ext.add_inactive_statusline_func(name) dict
   call airline#add_inactive_statusline_func(a:name)
 endfunction
+function! s:ext.add_theme_func(name) dict
+  call add(self._theme_funcrefs, function(a:name))
+endfunction
 
-let s:script_path = resolve(expand('<sfile>:p:h'))
+let s:script_path = tolower(resolve(expand('<sfile>:p:h')))
 
 let s:filetype_overrides = {
       \ 'netrw': [ 'netrw', '%f' ],
@@ -28,11 +33,7 @@ let s:filetype_regex_overrides = {}
 
 function! s:check_defined_section(name)
   if !exists('w:airline_section_{a:name}')
-    if g:airline_section_{a:name} == '__'
-      let w:airline_section_{a:name} = ''
-    else
-      let w:airline_section_{a:name} = g:airline_section_{a:name}
-    endif
+    let w:airline_section_{a:name} = g:airline_section_{a:name}
   endif
 endfunction
 
@@ -55,7 +56,7 @@ function! airline#extensions#apply_left_override(section1, section2)
 endfunction
 
 let s:active_winnr = -1
-function! airline#extensions#update_statusline(...)
+function! airline#extensions#apply(...)
   if s:is_excluded_window()
     return -1
   endif
@@ -113,9 +114,7 @@ function! s:is_excluded_window()
 endfunction
 
 function! airline#extensions#load_theme()
-  if get(g:, 'loaded_ctrlp', 0)
-    call airline#extensions#ctrlp#load_theme()
-  endif
+  call airline#util#exec_funcrefs(s:ext._theme_funcrefs, g:airline#themes#{g:airline_theme}#palette)
 endfunction
 
 function! s:sync_active_winnr()
@@ -128,9 +127,6 @@ function! airline#extensions#load()
   " non-trivial number of external plugins use eventignore=all, so we need to account for that
   autocmd CursorMoved * call <sid>sync_active_winnr()
 
-  " load core funcrefs
-  call airline#add_statusline_func('airline#extensions#update_statusline')
-
   if get(g:, 'loaded_unite', 0)
     call airline#extensions#unite#init(s:ext)
   endif
@@ -185,34 +181,25 @@ function! airline#extensions#load()
     call airline#extensions#virtualenv#init(s:ext)
   endif
 
-  if g:airline_section_warning == '__'
-    if (get(g:, 'airline#extensions#whitespace#enabled', 1) && get(g:, 'airline_detect_whitespace', 1))
-      call airline#extensions#whitespace#init(s:ext)
-    endif
-    if (get(g:, 'airline#extensions#syntastic#enabled', 1) && get(g:, 'airline_enable_syntastic', 1))
-          \ && exists(':SyntasticCheck')
-      call airline#extensions#syntastic#init(s:ext)
-    endif
+  if (get(g:, 'airline#extensions#syntastic#enabled', 1) && get(g:, 'airline_enable_syntastic', 1))
+        \ && exists(':SyntasticCheck')
+    call airline#extensions#syntastic#init(s:ext)
   endif
 
-  if get(g:, 'airline#extensions#readonly#enabled', 1)
-    call airline#extensions#readonly#init()
+  if (get(g:, 'airline#extensions#whitespace#enabled', 1) && get(g:, 'airline_detect_whitespace', 1))
+    call airline#extensions#whitespace#init(s:ext)
   endif
 
-  if (get(g:, 'airline#extensions#paste#enabled', 1) && get(g:, 'airline_detect_paste', 1))
-    call airline#extensions#paste#init()
-  endif
-
-  if get(g:, 'airline#extensions#iminsert#enabled', 0) || get(g:, 'airline_detect_iminsert', 0)
-    call airline#extensions#iminsert#init()
+  if get(g:, 'airline#extensions#tabline#enabled', 0)
+    call airline#extensions#tabline#init(s:ext)
   endif
 
   " load all other extensions not part of the default distribution
   for file in split(globpath(&rtp, "autoload/airline/extensions/*.vim"), "\n")
-    " check to see that both the resolved and unresolved paths do not match
-    " up with the path of the found extension
-    if stridx(resolve(fnamemodify(file, ':p')), s:script_path) < 0
-          \ && stridx(fnamemodify(file, ':p'), s:script_path) < 0
+    " we have to check both resolved and unresolved paths, since it's possible
+    " that they might not get resolved properly (see #187)
+    if stridx(tolower(resolve(fnamemodify(file, ':p'))), s:script_path) < 0
+          \ && stridx(tolower(fnamemodify(file, ':p')), s:script_path) < 0
       let name = fnamemodify(file, ':t:r')
       if !get(g:, 'airline#extensions#'.name.'#enabled', 1)
         continue

autoload/airline/extensions/branch.vim

@@ -3,8 +3,7 @@
 
 let s:empty_message = get(g:, 'airline#extensions#branch#empty_message',
       \ get(g:, 'airline_branch_empty_message', ''))
-let s:symbol = get(g:, 'airline#extensions#branch#symbol',
-      \ get(g:, 'airline_branch_prefix', get(g:, 'airline_powerline_fonts', 0) ? ' ' : ''))
+let s:symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch)
 
 let s:has_fugitive = exists('*fugitive#head')
 let s:has_fugitive_detect = exists('*fugitive#detect')
@@ -28,10 +27,24 @@ function! airline#extensions#branch#get_head()
     endif
   endif
 
-  return empty(head) ? s:empty_message : s:symbol.head
+  return empty(head) || !s:check_in_path()
+        \ ? s:empty_message
+        \ : printf('%s%s', empty(s:symbol) ? '' : s:symbol.' ', head)
+endfunction
+
+function! s:check_in_path()
+  if !exists('b:airline_branch_path')
+    let root = get(b:, 'git_dir', get(b:, 'mercurial_dir', ''))
+    let bufferpath = resolve(fnamemodify(expand('%'), ':p:h'))
+    let root = fnamemodify(root, ':h')
+    let b:airline_file_in_root = stridx(bufferpath, root) > -1
+  endif
+  return b:airline_file_in_root
 endfunction
 
 function! airline#extensions#branch#init(ext)
-  let g:airline_section_b .= '%{airline#extensions#branch#get_head()}'
+  call airline#parts#define_function('branch', 'airline#extensions#branch#get_head')
+
+  autocmd BufReadPost * unlet! b:airline_file_in_root
 endfunction
 

autoload/airline/extensions/bufferline.vim

@@ -1,16 +1,19 @@
 " MIT License. Copyright (c) 2013 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
-function! airline#extensions#bufferline#init(ext)
-  highlight bufferline_selected gui=bold cterm=bold term=bold
-  highlight link bufferline_selected_inactive airline_c_inactive
-  let g:bufferline_inactive_highlight = 'airline_c'
-  let g:bufferline_active_highlight = 'bufferline_selected'
-  let g:bufferline_active_buffer_left = ''
-  let g:bufferline_active_buffer_right = ''
-  let g:bufferline_separator = ' '
+let s:overwrite = get(g:, 'airline#extensions#bufferline#overwrite_variables', 1)
 
-  if g:airline_section_c == '%f%m'
-    let g:airline_section_c = '%{bufferline#refresh_status()}'.bufferline#get_status_string()
+function! airline#extensions#bufferline#init(ext)
+  if s:overwrite
+    highlight bufferline_selected gui=bold cterm=bold term=bold
+    highlight link bufferline_selected_inactive airline_c_inactive
+    let g:bufferline_inactive_highlight = 'airline_c'
+    let g:bufferline_active_highlight = 'bufferline_selected'
+    let g:bufferline_active_buffer_left = ''
+    let g:bufferline_active_buffer_right = ''
+    let g:bufferline_separator = ' '
   endif
+
+  call airline#parts#define_raw('file', '%{bufferline#refresh_status()}'.bufferline#get_status_string())
 endfunction
+

autoload/airline/extensions/ctrlp.vim

@@ -14,15 +14,15 @@ function! airline#extensions#ctrlp#generate_color_map(dark, light, white)
         \ }
 endfunction
 
-function! airline#extensions#ctrlp#load_theme()
-  if exists('g:airline#themes#{g:airline_theme}#palette.ctrlp')
-    let theme = g:airline#themes#{g:airline_theme}#palette.ctrlp
+function! airline#extensions#ctrlp#load_theme(palette)
+  if exists('a:palette.ctrlp')
+    let theme = a:palette.ctrlp
   else
-    let s:color_template = has_key(g:airline#themes#{g:airline_theme}#palette, s:color_template) ? s:color_template : 'insert'
+    let s:color_template = has_key(a:palette, s:color_template) ? s:color_template : 'insert'
     let theme = airline#extensions#ctrlp#generate_color_map(
-          \ g:airline#themes#{g:airline_theme}#palette[s:color_template]['airline_c'],
-          \ g:airline#themes#{g:airline_theme}#palette[s:color_template]['airline_b'],
-          \ g:airline#themes#{g:airline_theme}#palette[s:color_template]['airline_a'])
+          \ a:palette[s:color_template]['airline_c'],
+          \ a:palette[s:color_template]['airline_b'],
+          \ a:palette[s:color_template]['airline_a'])
   endif
   for key in keys(theme)
     call airline#highlighter#exec(key, theme[key])
@@ -60,5 +60,6 @@ function! airline#extensions#ctrlp#init(ext)
         \ 'prog': 'airline#extensions#ctrlp#ctrlp_airline_status',
         \ }
   call a:ext.add_statusline_func('airline#extensions#ctrlp#apply')
+  call a:ext.add_theme_func('airline#extensions#ctrlp#load_theme')
 endfunction
 

autoload/airline/extensions/default.vim

@@ -0,0 +1,62 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:section_truncate_width = get(g:, 'airline#extensions#default#section_truncate_width', {
+      \ 'b': 88,
+      \ 'x': 60,
+      \ 'y': 88,
+      \ 'z': 45,
+      \ })
+let s:layout = get(g:, 'airline#extensions#default#layout', [
+      \ [ 'a', 'b', 'c' ],
+      \ [ 'x', 'y', 'z', 'warning' ]
+      \ ])
+
+function! s:get_section(winnr, key, ...)
+  if has_key(s:section_truncate_width, a:key)
+    if winwidth(a:winnr) < s:section_truncate_width[a:key]
+      return ''
+    endif
+  endif
+  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, ' %)')]
+  return empty(text) ? '' : prefix.text.suffix
+endfunction
+
+function! s:build_sections(builder, context, keys)
+  for key in a:keys
+    if key == 'warning' && !a:context.active
+      continue
+    endif
+
+    " i have no idea why the warning section needs special treatment, but it's
+    " needed to prevent separators from showing up
+    if key == 'warning'
+      call a:builder.add_raw('%(')
+    endif
+    call a:builder.add_section('airline_'.key, s:get_section(a:context.winnr, key))
+    if key == 'warning'
+      call a:builder.add_raw('%)')
+    endif
+  endfor
+endfunction
+
+function! airline#extensions#default#apply(builder, context)
+  let winnr = a:context.winnr
+  let active = a:context.active
+
+  if airline#util#getwinvar(winnr, 'airline_render_left', active || (!active && !g:airline_inactive_collapse))
+    call <sid>build_sections(a:builder, a:context, s:layout[0])
+  else
+    call a:builder.add_section('airline_c'.(a:context.bufnr), ' %f%m ')
+  endif
+
+  call a:builder.split(s:get_section(winnr, 'gutter', '', ''))
+
+  if airline#util#getwinvar(winnr, 'airline_render_right', 1)
+    call <sid>build_sections(a:builder, a:context, s:layout[1])
+  endif
+
+  return 1
+endfunction
+

autoload/airline/extensions/example.vim

@@ -6,24 +6,18 @@ if !exists('g:airline#extensions#example#number_of_cats')
   let g:airline#extensions#example#number_of_cats = 42
 endif
 
-" There are predominantly two methods for integrating a plugin into
-" vim-airline.  The first method here simply modifies the global section and
-" appends information to it.  This is useful for cases where the information
-" should be displayed all the time for all filetypes.
+" First we define an init function that will be invoked from extensions.vim
 function! airline#extensions#example#init(ext)
-  let g:airline_section_y .= '%{airline#extensions#example#get_cats()}'
-endfunction
 
-" The second method involves using the 'ext'ension manager that was passed in
-" and appends a name of a function.  This function will be invoked just prior
-" to updating the statusline.  This method is useful for plugin-specific
-" statuslines (like NERDTree or Tagbar) or language specific plugins (like
-" virtualenv) which do not need to be loaded all the time.
-function! airline#extensions#example#init(ext)
+  " Here we define a new part for the plugin.  This allows users to place this
+  " extension in arbitrary locations.
+  call airline#parts#define_raw('cats', '%{airline#extensions#example#get_cats()}')
+
+  " Next up we add a funcref so that we can run some code prior to the
+  " statusline getting modifed.
   call a:ext.add_statusline_func('airline#extensions#example#apply')
 
-  " There is also the following function for making changes just prior to an
-  " inactive statusline.
+  " You can also add a funcref for inactive statuslines.
   " call a:ext.add_inactive_statusline_func('airline#extensions#example#unapply')
 endfunction
 
@@ -31,10 +25,14 @@ endfunction
 function! airline#extensions#example#apply(...)
   " First we check for the filetype.
   if &filetype == "nyancat"
-    " Let's use a helper function.  It will take care of ensuring that the
-    " window-local override exists (and create one based on the global
-    " airline_section if not), and prepend to it.
-    call airline#extensions#prepend_to_section('x', '%{airline#extensions#example#get_cats()} ')
+
+    " Let's say we want to append to section_c, first we check if there's
+    " already a window-local override, and if not, create it off of the global
+    " section_c.
+    let w:airline_section_c = get(w:, 'airline_section_c', g:airline_section_c)
+
+    " Then we just append this extenion to it, optionally using separators.
+    let w:airline_section_c .= ' '.g:airline_left_alt_sep.' %{airline#extensions#example#get_cats()}'
   endif
 endfunction
 

autoload/airline/extensions/hunks.vim

@@ -4,43 +4,43 @@
 let s:non_zero_only = get(g:, 'airline#extensions#hunks#non_zero_only', 0)
 let s:hunk_symbols = get(g:, 'airline#extensions#hunks#hunk_symbols', ['+', '~', '-'])
 
-let s:initialized = 0
-function! s:init()
-  if !s:initialized
-    let s:initialized = 1
-    if get(g:, 'loaded_signify', 0)
-      function! s:get_hunks()
-        " this is a temporary fix (see #188)
-        let fname = fnamemodify(bufname('%'), ':p')
-        if has_key(g:sy, fname) && has_key(g:sy[fname], 'hunks')
-          if len(g:sy[fname].hunks) == 0
-            return [0, 0, 0]
-          endif
-        endif
+function! s:get_hunks_signify()
+  let hunks = sy#repo#get_stats()
+  if hunks[0] >= 0
+    return hunks
+  endif
+  return []
+endfunction
 
-        let hunks = sy#repo#get_stats()
-        if hunks[0] >= 0
-          return hunks
-        endif
-        return []
-      endfunction
+function! s:get_hunks_gitgutter()
+  if !get(g:, 'gitgutter_enabled', 0)
+    return ''
+  endif
+  return GitGutterGetHunkSummary()
+endfunction
+
+function! s:get_hunks_empty()
+  return ''
+endfunction
+
+let s:source_func = ''
+function! s:get_hunks()
+  if empty(s:source_func)
+    if get(g:, 'loaded_signify', 0)
+      let s:source_func = 's:get_hunks_signify'
     elseif exists('*GitGutterGetHunkSummary')
-      function! s:get_hunks()
-        if !get(g:, 'gitgutter_enabled', 0)
-          return ''
-        endif
-        return GitGutterGetHunkSummary()
-      endfunction
+      let s:source_func = 's:get_hunks_gitgutter'
     else
-      function! s:get_hunks()
-        return []
-      endfunction
+      let s:source_func = 's:get_hunks_empty'
     endif
   endif
+  return {s:source_func}()
 endfunction
 
 function! airline#extensions#hunks#get_hunks()
-  call <sid>init()
+  if !get(w:, 'airline_active', 0)
+    return ''
+  endif
   let hunks = s:get_hunks()
   let string = ''
   if !empty(hunks)
@@ -54,6 +54,6 @@ function! airline#extensions#hunks#get_hunks()
 endfunction
 
 function! airline#extensions#hunks#init(ext)
-  let g:airline_section_b .= '%{airline#extensions#hunks#get_hunks()}'
+  call airline#parts#define_function('hunks', 'airline#extensions#hunks#get_hunks')
 endfunction
 

autoload/airline/extensions/iminsert.vim

@@ -1,14 +0,0 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-function! airline#extensions#iminsert#get_text()
-  if &iminsert
-    return toupper(get(b:, 'keymap_name', 'lang'))
-  endif
-  return ''
-endfunction
-
-function! airline#extensions#iminsert#init()
-  let g:airline_section_a .= ' '.g:airline_left_alt_sep.' %{airline#extensions#iminsert#get_text()}'
-endfunction
-

autoload/airline/extensions/paste.vim

@@ -1,14 +0,0 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let s:symbol = get(g:, 'airline#extensions#paste#symbol',
-      \ get(g:, 'airline_paste_symbol', (get(g:, 'airline_powerline_fonts', 0) ? ' ' : '').'PASTE'))
-
-function! airline#extensions#paste#get_mark()
-  return &paste ? '  ' . s:symbol : ''
-endfunction
-
-function! airline#extensions#paste#init()
-  let g:airline_section_a .= '%{airline#extensions#paste#get_mark()}'
-endfunction
-

autoload/airline/extensions/readonly.vim

@@ -1,15 +0,0 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let s:symbol = get(g:, 'airline#extensions#readonly#symbol',
-      \ get(g:, 'airline_readonly_symbol', get(g:, 'airline_powerline_fonts', 0) ? '' : 'RO'))
-
-function! airline#extensions#readonly#get_mark()
-  return &ro ? s:symbol : ''
-endfunction
-
-function! airline#extensions#readonly#init()
-  let g:airline_section_gutter = ' %#airline_file#%{airline#extensions#readonly#get_mark()} '
-        \ .g:airline_section_gutter
-endfunction
-

autoload/airline/extensions/syntastic.vim

@@ -1,11 +1,15 @@
 " MIT License. Copyright (c) 2013 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
-function! airline#extensions#syntastic#apply(...)
-  call airline#extensions#append_to_section('warning', '%{SyntasticStatuslineFlag()}')
+function! airline#extensions#syntastic#get_warnings()
+  let errors = SyntasticStatuslineFlag()
+  if strlen(errors) > 0
+    return errors.' '
+  endif
+  return ''
 endfunction
 
 function! airline#extensions#syntastic#init(ext)
-  call a:ext.add_statusline_func('airline#extensions#syntastic#apply')
+  call airline#parts#define_function('syntastic', 'airline#extensions#syntastic#get_warnings')
 endfunction
 

autoload/airline/extensions/tabline.vim

@@ -0,0 +1,170 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:formatter = get(g:, 'airline#extensions#tabline#formatter', 'default')
+let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
+let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
+let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
+
+let s:builder_context = {
+      \ 'active'        : 1,
+      \ 'left_sep'      : get(g:, 'airline#extensions#tabline#left_sep'     , g:airline_left_sep),
+      \ 'left_alt_sep'  : get(g:, 'airline#extensions#tabline#left_alt_sep' , g:airline_left_alt_sep),
+      \ 'right_sep'     : get(g:, 'airline#extensions#tabline#right_sep'    , g:airline_right_sep),
+      \ 'right_alt_sep' : get(g:, 'airline#extensions#tabline#right_alt_sep', g:airline_right_alt_sep),
+      \ }
+
+let s:buf_min_count = get(g:, 'airline#extensions#tabline#buffer_min_count', 0)
+let s:buf_len = 0
+
+" TODO: temporary
+let s:buf_max = get(g:, 'airline#extensions#tabline#buffer_max', winwidth(0) / 16)
+
+function! airline#extensions#tabline#init(ext)
+  if has('gui_running')
+    set guioptions-=e
+  endif
+
+  set tabline=%!airline#extensions#tabline#get()
+
+  if s:buf_min_count <= 0
+    set showtabline=2
+  else
+    autocmd CursorMoved * call <sid>cursormove()
+  endif
+
+  call a:ext.add_theme_func('airline#extensions#tabline#load_theme')
+endfunction
+
+function! airline#extensions#tabline#load_theme(palette)
+  let colors    = get(a:palette, 'tabline', {})
+  let l:tab     = get(colors, 'airline_tab', a:palette.normal.airline_b)
+  let l:tabsel  = get(colors, 'airline_tabsel', a:palette.normal.airline_a)
+  let l:tabtype = get(colors, 'airline_tabtype', a:palette.visual.airline_a)
+  let l:tabfill = get(colors, 'airline_tabfill', a:palette.normal.airline_c)
+  let l:tabmod  = get(colors, 'airline_tabmod', a:palette.insert.airline_a)
+  let l:tabhid  = get(colors, 'airline_tabhid', a:palette.normal.airline_c)
+  call airline#highlighter#exec('airline_tab', l:tab)
+  call airline#highlighter#exec('airline_tabsel', l:tabsel)
+  call airline#highlighter#exec('airline_tabtype', l:tabtype)
+  call airline#highlighter#exec('airline_tabfill', l:tabfill)
+  call airline#highlighter#exec('airline_tabmod', l:tabmod)
+  call airline#highlighter#exec('airline_tabhid', l:tabhid)
+endfunction
+
+function! s:cursormove()
+  let c = len(s:get_buffer_list())
+  if c > s:buf_min_count
+    if &showtabline != 2
+      set showtabline=2
+    endif
+  else
+    if &showtabline != 0
+      set showtabline=0
+    endif
+  endif
+endfunction
+
+function! airline#extensions#tabline#get()
+  if s:show_buffers && tabpagenr('$') == 1
+    return s:get_buffers()
+  else
+    return s:get_tabs()
+  endif
+endfunction
+
+function! airline#extensions#tabline#title(n)
+  let buflist = tabpagebuflist(a:n)
+  let winnr = tabpagewinnr(a:n)
+  return airline#extensions#tabline#get_buffer_name(buflist[winnr - 1])
+endfunction
+
+function! airline#extensions#tabline#get_buffer_name(nr)
+  return airline#extensions#tabline#formatters#{s:formatter}(a:nr, get(s:, 'current_buffer_list', []))
+endfunction
+
+function! s:get_buffer_list()
+  let buffers = []
+  let cur = bufnr('%')
+  for nr in range(1, bufnr('$'))
+    if buflisted(nr) && bufexists(nr)
+      for ex in s:excludes
+        if match(bufname(nr), ex)
+          continue
+        endif
+      endfor
+      call add(buffers, nr)
+    endif
+  endfor
+
+  " TODO: temporary fix; force the active buffer to be first when there are many buffers open
+  if len(buffers) > s:buf_max && index(buffers, cur) > -1
+    while buffers[1] != cur
+      let first = remove(buffers, 0)
+      call add(buffers, first)
+    endwhile
+    let buffers = buffers[:s:buf_max]
+  endif
+
+  let s:current_buffer_list = buffers
+  return buffers
+endfunction
+
+function! s:get_buffers()
+  let b = airline#builder#new(s:builder_context)
+  let cur = bufnr('%')
+  let tab_bufs = tabpagebuflist(tabpagenr())
+  for nr in s:get_buffer_list()
+    if cur == nr
+      if g:airline_detect_modified && getbufvar(nr, '&modified')
+        let group = 'airline_tabmod'
+      else
+        let group = 'airline_tabsel'
+      endif
+    else
+      if index(tab_bufs, nr) > -1
+        let group = 'airline_tab'
+      else
+        let group = 'airline_tabhid'
+      endif
+    endif
+    call b.add_section(group, '%( %{airline#extensions#tabline#get_buffer_name('.nr.')} %)')
+  endfor
+
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  call b.add_section('airline_tabtype', ' buffers ')
+  return b.build()
+endfunction
+
+function! s:get_tabs()
+  let b = airline#builder#new(s:builder_context)
+  for i in range(1, tabpagenr('$'))
+    if i == tabpagenr()
+      let group = 'airline_tabsel'
+      if g:airline_detect_modified
+        for bi in tabpagebuflist(i)
+          if getbufvar(bi, '&modified')
+            let group = 'airline_tabmod'
+          endif
+        endfor
+      endif
+    else
+      let group = 'airline_tab'
+    endif
+    let val = '%('
+    if s:tab_nr_type == 0
+      let val .= ' %{len(tabpagebuflist('.i.'))}'
+    else
+      let val .= ' '.i
+    endif
+    call b.add_section(group, val.'%'.i.'T %{airline#extensions#tabline#title('.i.')} %)')
+  endfor
+  call b.add_raw('%T')
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  call b.add_section('airline_tab', ' %999XX ')
+  call b.add_section('airline_tabtype', ' tabs ')
+  return b.build()
+endfunction
+

autoload/airline/extensions/tabline/formatters.vim

@@ -0,0 +1,34 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:fmod = get(g:, 'airline#extensions#tabline#fnamemod', ':~:.')
+let s:fnamecollapse = get(g:, 'airline#extensions#tabline#fnamecollapse', 1)
+let s:buf_nr_format = get(g:, 'airline#extensions#tabline#buffer_nr_format', '%s: ')
+let s:buf_nr_show = get(g:, 'airline#extensions#tabline#buffer_nr_show', 0)
+let s:buf_modified_symbol = g:airline_symbols.modified
+
+function! airline#extensions#tabline#formatters#default(bufnr, buffers)
+  let _ = ''
+
+  if s:buf_nr_show
+    let _ .= printf(s:buf_nr_format, a:bufnr)
+  endif
+
+  let name = bufname(a:bufnr)
+  if empty(name)
+    let _ .= '[No Name]'
+  else
+    if s:fnamecollapse
+      let _ .= substitute(fnamemodify(name, s:fmod), '\v\w\zs.{-}\ze(\\|/)', '', 'g')
+    else
+      let _ .= fnamemodify(name, s:fmod)
+    endif
+  endif
+
+  if getbufvar(a:bufnr, '&modified') == 1
+    let _ .= s:buf_modified_symbol
+  endif
+
+  return _
+endfunction
+

autoload/airline/extensions/tagbar.vim

@@ -1,6 +1,8 @@
 " MIT License. Copyright (c) 2013 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+let s:flags = get(g:, 'airline#extensions#tagbar#flags', '')
+
 " Arguments: current, sort, fname
 function! airline#extensions#tagbar#get_status(...)
   let builder = airline#builder#new({ 'active': a:1 })
@@ -16,11 +18,17 @@ function! airline#extensions#tagbar#inactive_apply(...)
   endif
 endfunction
 
+function! airline#extensions#tagbar#currenttag()
+  if get(w:, 'airline_active', 0)
+    return tagbar#currenttag('%s', '', s:flags)
+  endif
+  return ''
+endfunction
+
 function! airline#extensions#tagbar#init(ext)
   call a:ext.add_inactive_statusline_func('airline#extensions#tagbar#inactive_apply')
   let g:tagbar_status_func = 'airline#extensions#tagbar#get_status'
 
-  let g:airline_section_x = '%(%{get(w:,"airline_active",0) ? tagbar#currenttag("%s","") : ""} '
-        \ .g:airline_right_alt_sep.' %)'.g:airline_section_x
+  call airline#parts#define_function('tagbar', 'airline#extensions#tagbar#currenttag')
 endfunction
 

autoload/airline/extensions/unite.vim

@@ -4,10 +4,10 @@
 function! airline#extensions#unite#apply(...)
   if &ft == 'unite'
     call a:1.add_section('airline_a', ' Unite ')
-    call a:1.add_section('airline_b', ' %{unite#get_context().buffer_name} ')
+    call a:1.add_section('airline_b', ' %{get(unite#get_context(), "buffer_name", "")} ')
     call a:1.add_section('airline_c', ' %{unite#get_status_string()} ')
     call a:1.split()
-    call a:1.add_section('airline_y', ' %{unite#get_context().real_buffer_name} ')
+    call a:1.add_section('airline_y', ' %{get(unite#get_context(), "real_buffer_name", "")} ')
     return 1
   endif
 endfunction

autoload/airline/extensions/virtualenv.vim

@@ -6,7 +6,7 @@ function! airline#extensions#virtualenv#init(ext)
 endfunction
 
 function! airline#extensions#virtualenv#apply(...)
-  if &filetype == "python"
+  if &filetype =~ "python"
     call airline#extensions#append_to_section('x', ' '.g:airline_right_alt_sep.' %{virtualenv#statusline()}')
   endif
 endfunction

autoload/airline/extensions/whitespace.vim

@@ -10,15 +10,12 @@ else
   let s:show_message = get(g:, 'airline#extensions#whitespace#show_message', 1)
 endif
 
-let s:symbol = get(g:, 'airline#extensions#whitespace#symbol',
-      \ get(g:, 'airline_whitespace_symbol', get(g:, 'airline_powerline_fonts', 0) ? '✹' : '!'))
-
+let s:symbol = get(g:, 'airline#extensions#whitespace#symbol', g:airline_symbols.whitespace)
 let s:checks = get(g:, 'airline#extensions#whitespace#checks', ['indent', 'trailing'])
 
 let s:trailing_format = get(g:, 'airline#extensions#whitespace#trailing_format', 'trailing[%s]')
 let s:mixed_indent_format = get(g:, 'airline#extensions#whitespace#mixed_indent_format', 'mixed-indent[%s]')
 
-let s:initialized = 0
 let s:enabled = 1
 
 function! airline#extensions#whitespace#check()
@@ -36,19 +33,19 @@ function! airline#extensions#whitespace#check()
 
     let mixed = 0
     if index(s:checks, 'indent') > -1
-      let indents = [search('^ ', 'nb'), search('^ ', 'n'), search('^\t', 'nb'), search('^\t', 'n')]
+      let indents = [search('^ \{2,}', 'nb'), search('^ \{2,}', 'n'), search('^\t', 'nb'), search('^\t', 'n')]
       let mixed = indents[0] != 0 && indents[1] != 0 && indents[2] != 0 && indents[3] != 0
     endif
 
     if trailing != 0 || mixed
-      let b:airline_whitespace_check = s:symbol." "
+      let b:airline_whitespace_check = s:symbol.' '
       if s:show_message
         if trailing != 0
-          let b:airline_whitespace_check .= printf(s:trailing_format, trailing).' '
+          let b:airline_whitespace_check .= printf(s:trailing_format, trailing)
         endif
         if mixed
           let mixnr = indents[0] == indents[1] ? indents[0] : indents[2]
-          let b:airline_whitespace_check .= printf(s:mixed_indent_format, mixnr).' '
+          let b:airline_whitespace_check .= printf(s:mixed_indent_format, mixnr)
         endif
       endif
     endif
@@ -56,25 +53,20 @@ function! airline#extensions#whitespace#check()
   return b:airline_whitespace_check
 endfunction!
 
-function! airline#extensions#whitespace#apply(...)
-  call airline#extensions#append_to_section('warning', ' %{airline#extensions#whitespace#check()}')
-endfunction
-
 function! airline#extensions#whitespace#toggle()
   if s:enabled
     autocmd! airline_whitespace CursorHold,BufWritePost
+    augroup! airline_whitespace
     let s:enabled = 0
   else
     call airline#extensions#whitespace#init()
     let s:enabled = 1
   endif
+  echo 'Whitespace checking: '.(s:enabled ? 'Enabled' : 'Disabled')
 endfunction
 
 function! airline#extensions#whitespace#init(...)
-  if !s:initialized
-    let s:initialized = 1
-    call airline#add_statusline_func('airline#extensions#whitespace#apply')
-  endif
+  call airline#parts#define_function('whitespace', 'airline#extensions#whitespace#check')
 
   unlet! b:airline_whitespace_check
   augroup airline_whitespace

autoload/airline/highlighter.vim

@@ -13,6 +13,44 @@ function! s:gui2cui(rgb, fallback)
   return rgb[0]+rgb[1]+rgb[2]
 endfunction
 
+function! s:get_syn(group, what)
+  " need to pass in mode, known to break on 7.3.547
+  let mode = has('gui_running') ? 'gui' : 'cterm'
+  let color = synIDattr(synIDtrans(hlID(a:group)), a:what, mode)
+  if empty(color) || color == -1
+    let color = synIDattr(synIDtrans(hlID('Normal')), a:what, mode)
+  endif
+  if empty(color) || color == -1
+    if has('gui_running')
+      let color = a:what ==# 'fg' ? '#000000' : '#FFFFFF'
+    else
+      let color = a:what ==# 'fg' ? 0 : 1
+    endif
+  endif
+  return color
+endfunction
+
+function! s:get_array(fg, bg, opts)
+  let fg = a:fg
+  let bg = a:bg
+  return has('gui_running')
+        \ ? [ fg, bg, '', '', join(a:opts, ',') ]
+        \ : [ '', '', fg, bg, join(a:opts, ',') ]
+endfunction
+
+function! airline#highlighter#get_highlight(group, ...)
+  let fg = s:get_syn(a:group, 'fg')
+  let bg = s:get_syn(a:group, 'bg')
+  let reverse = synIDattr(synIDtrans(hlID(a:group)), 'reverse', has('gui_running') ? 'gui' : 'term')
+  return reverse ? s:get_array(bg, fg, a:000) : s:get_array(fg, bg, a:000)
+endfunction
+
+function! airline#highlighter#get_highlight2(fg, bg, ...)
+  let fg = s:get_syn(a:fg[0], a:fg[1])
+  let bg = s:get_syn(a:bg[0], a:bg[1])
+  return s:get_array(fg, bg, a:000)
+endfunction
+
 function! airline#highlighter#exec(group, colors)
   let colors = a:colors
   if s:is_win32term
@@ -44,12 +82,30 @@ function! s:exec_separator(dict, from, to, inverse, suffix)
 endfunction
 
 function! airline#highlighter#load_theme()
+  for winnr in filter(range(1, winnr('$')), 'v:val != winnr()')
+    call airline#highlighter#highlight_modified_inactive(winbufnr(winnr))
+  endfor
   call airline#highlighter#highlight(['inactive'])
   call airline#highlighter#highlight(['normal'])
 endfunction
 
 function! airline#highlighter#add_separator(from, to, inverse)
   let s:separators[a:from.a:to] = [a:from, a:to, a:inverse]
+  call <sid>exec_separator({}, a:from, a:to, a:inverse, '')
+endfunction
+
+function! airline#highlighter#highlight_modified_inactive(bufnr)
+  if getbufvar(a:bufnr, '&modified')
+    let colors = exists('g:airline#themes#{g:airline_theme}#palette.inactive_modified.airline_c')
+          \ ? g:airline#themes#{g:airline_theme}#palette.inactive_modified.airline_c : []
+  else
+    let colors = exists('g:airline#themes#{g:airline_theme}#palette.inactive.airline_c')
+          \ ? g:airline#themes#{g:airline_theme}#palette.inactive.airline_c : []
+  endif
+
+  if !empty(colors)
+    call airline#highlighter#exec('airline_c'.(a:bufnr).'_inactive', colors)
+  endif
 endfunction
 
 function! airline#highlighter#highlight(modes)

autoload/airline/init.vim

@@ -0,0 +1,100 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+function! s:check_defined(variable, default)
+  if !exists(a:variable)
+    let {a:variable} = a:default
+  endif
+endfunction
+
+let s:loaded = 0
+function! airline#init#bootstrap()
+  if s:loaded | return | endif | let s:loaded = 1
+
+  call s:check_defined('g:airline_left_sep', get(g:, 'airline_powerline_fonts', 0)?"":">")
+  call s:check_defined('g:airline_left_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"":">")
+  call s:check_defined('g:airline_right_sep', get(g:, 'airline_powerline_fonts', 0)?"":"<")
+  call s:check_defined('g:airline_right_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"":"<")
+  call s:check_defined('g:airline_detect_modified', 1)
+  call s:check_defined('g:airline_detect_paste', 1)
+  call s:check_defined('g:airline_detect_iminsert', 0)
+  call s:check_defined('g:airline_inactive_collapse', 1)
+  call s:check_defined('g:airline_exclude_filenames', ['DebuggerWatch','DebuggerStack','DebuggerStatus'])
+  call s:check_defined('g:airline_exclude_filetypes', [])
+  call s:check_defined('g:airline_exclude_preview', 0)
+
+  call s:check_defined('g:airline_mode_map', {})
+  call extend(g:airline_mode_map, {
+        \ '__' : '------',
+        \ 'n'  : 'NORMAL',
+        \ 'i'  : 'INSERT',
+        \ 'R'  : 'REPLACE',
+        \ 'v'  : 'VISUAL',
+        \ 'V'  : 'V-LINE',
+        \ 'c'  : 'COMMAND',
+        \ '' : 'V-BLOCK',
+        \ 's'  : 'SELECT',
+        \ 'S'  : 'S-LINE',
+        \ '' : 'S-BLOCK',
+        \ }, 'keep')
+
+  call s:check_defined('g:airline_theme_map', {})
+  call extend(g:airline_theme_map, {
+        \ 'Tomorrow.*': 'tomorrow',
+        \ 'base16.*': 'base16',
+        \ 'mo[l|n]okai': 'molokai',
+        \ 'wombat.*': 'wombat',
+        \ '.*zenburn.*': 'zenburn',
+        \ '.*solarized.*': 'solarized',
+        \ }, 'keep')
+
+  call s:check_defined('g:airline_symbols', {})
+  call extend(g:airline_symbols, {
+        \ 'paste': get(g:, 'airline_paste_symbol', 'PASTE'),
+        \ 'readonly': get(g:, 'airline_readonly_symbol', get(g:, 'airline_powerline_fonts', 0) ? '' : 'RO'),
+        \ 'whitespace': get(g:, 'airline_powerline_fonts', 0) ? '✹' : '!',
+        \ 'linenr': get(g:, 'airline_linecolumn_prefix', get(g:, 'airline_powerline_fonts', 0) ? '' : ':' ),
+        \ 'branch': get(g:, 'airline_branch_prefix', get(g:, 'airline_powerline_fonts', 0) ? '' : ''),
+        \ 'modified': '+',
+        \ }, 'keep')
+
+  call airline#parts#define_function('mode', 'airline#parts#mode')
+  call airline#parts#define_function('iminsert', 'airline#parts#iminsert')
+  call airline#parts#define_function('paste', 'airline#parts#paste')
+  call airline#parts#define_function('filetype', 'airline#parts#filetype')
+  call airline#parts#define('readonly', {
+        \ 'function': 'airline#parts#readonly',
+        \ 'highlight': 'airline_file',
+        \ })
+  call airline#parts#define_raw('file', '%f%m')
+  call airline#parts#define_function('ffenc', 'airline#parts#ffenc')
+  call airline#parts#define_empty(['hunks', 'branch', 'tagbar', 'syntastic', 'whitespace'])
+endfunction
+
+function! airline#init#sections()
+  if !exists('g:airline_section_a')
+    let g:airline_section_a = airline#section#create_left(['mode', 'paste', 'iminsert'])
+  endif
+  if !exists('g:airline_section_b')
+    let g:airline_section_b = airline#section#create(['hunks', 'branch'])
+  endif
+  if !exists('g:airline_section_c')
+    let g:airline_section_c = airline#section#create(['%<', 'file'])
+  endif
+  if !exists('g:airline_section_gutter')
+    let g:airline_section_gutter = airline#section#create([' ', 'readonly', '%='])
+  endif
+  if !exists('g:airline_section_x')
+    let g:airline_section_x = airline#section#create_right(['tagbar', 'filetype'])
+  endif
+  if !exists('g:airline_section_y')
+    let g:airline_section_y = airline#section#create_right(['ffenc'])
+  endif
+  if !exists('g:airline_section_z')
+    let g:airline_section_z = airline#section#create_right(['%3p%% %{g:airline_symbols.linenr} %3l:%3c '])
+  endif
+  if !exists('g:airline_section_warning')
+    let g:airline_section_warning = airline#section#create(['syntastic', 'whitespace'])
+  endif
+endfunction
+

autoload/airline/parts.vim

@@ -0,0 +1,71 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:parts = {}
+
+" PUBLIC API {{{
+
+function! airline#parts#define(key, config)
+  let s:parts[a:key] = get(s:parts, a:key, {})
+  call extend(s:parts[a:key], a:config)
+endfunction
+
+function! airline#parts#define_function(key, name)
+  call airline#parts#define(a:key, { 'function': a:name })
+endfunction
+
+function! airline#parts#define_text(key, text)
+  call airline#parts#define(a:key, { 'text': a:text })
+endfunction
+
+function! airline#parts#define_raw(key, raw)
+  call airline#parts#define(a:key, { 'raw': a:raw })
+endfunction
+
+function! airline#parts#define_minwidth(key, width)
+  call airline#parts#define(a:key, { 'minwidth': a:width })
+endfunction
+
+function! airline#parts#define_condition(key, predicate)
+  call airline#parts#define(a:key, { 'condition': a:predicate })
+endfunction
+
+function! airline#parts#define_empty(keys)
+  for key in a:keys
+    call airline#parts#define_raw(key, '')
+  endfor
+endfunction
+
+function! airline#parts#get(key)
+  return get(s:parts, a:key, {})
+endfunction
+
+" }}}
+
+function! airline#parts#mode()
+  return get(w:, 'airline_current_mode', '')
+endfunction
+
+function! airline#parts#paste()
+  return g:airline_detect_paste && &paste ? g:airline_symbols.paste : ''
+endfunction
+
+function! airline#parts#iminsert()
+  if g:airline_detect_iminsert && &iminsert && exists('b:keymap_name')
+    return toupper(b:keymap_name)
+  endif
+  return ''
+endfunction
+
+function! airline#parts#readonly()
+  return &readonly ? g:airline_symbols.readonly : ''
+endfunction
+
+function! airline#parts#filetype()
+  return &filetype
+endfunction
+
+function! airline#parts#ffenc()
+  return printf('%s%s', &fenc, strlen(&ff) > 0 ? '['.&ff.']' : '')
+endfunction
+

autoload/airline/section.vim

@@ -0,0 +1,68 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+call airline#init#bootstrap()
+
+function! s:create(parts, append)
+  let _ = ''
+  for idx in range(len(a:parts))
+    let part = airline#parts#get(a:parts[idx])
+
+    let val = ''
+    if exists('part.highlight')
+      let val .= '%#'.(part.highlight).'#'
+    endif
+
+    if exists('part.function')
+      let func = (part.function).'()'
+    elseif exists('part.text')
+      let func = '"'.(part.text).'"'
+    else
+      if a:append > 0 && idx != 0
+        let val .= ' '.g:airline_left_alt_sep.' '
+      endif
+      if a:append < 0 && idx != 0
+        let val = ' '.g:airline_right_alt_sep.' '.val
+      endif
+      if exists('part.raw')
+        let _ .= val.(part.raw)
+        continue
+      else
+        let _ .= val.a:parts[idx]
+        continue
+      endif
+    endif
+
+    let minwidth = get(part, 'minwidth', 0)
+
+    if a:append > 0 && idx != 0
+      let partval = printf('%%{airline#util#append(%s,%s)}', func, minwidth)
+    elseif a:append < 0 && idx != len(a:parts) - 1
+      let partval = printf('%%{airline#util#prepend(%s,%s)}', func, minwidth)
+    else
+      let partval = printf('%%{airline#util#wrap(%s,%s)}', func, minwidth)
+    endif
+
+    if exists('part.condition')
+      let partval = substitute(partval, '{', '{'.(part.condition).' ? ', '')
+      let partval = substitute(partval, '}', ' : ""}', '')
+    endif
+
+    let val .= partval
+    let _ .= val
+  endfor
+  return _
+endfunction
+
+function! airline#section#create(parts)
+  return s:create(a:parts, 0)
+endfunction
+
+function! airline#section#create_left(parts)
+  return s:create(a:parts, 1)
+endfunction
+
+function! airline#section#create_right(parts)
+  return s:create(a:parts, -1)
+endfunction
+

autoload/airline/themes.vim

@@ -15,44 +15,21 @@ function! airline#themes#generate_color_map(section1, section2, section3, file)
       \ }
 endfunction
 
-function! s:get_syn(group, what)
-  " need to pass in mode, known to break on 7.3.547
-  let mode = has('gui_running') ? 'gui' : 'cterm'
-  let color = synIDattr(synIDtrans(hlID(a:group)), a:what, mode)
-  if empty(color) || color == -1
-    let color = synIDattr(synIDtrans(hlID('Normal')), a:what, mode)
-  endif
-  if empty(color) || color == -1
-    if has('gui_running')
-      let color = a:what ==# 'fg' ? '#000000' : '#FFFFFF'
-    else
-      let color = a:what ==# 'fg' ? 0 : 1
-    endif
-  endif
-  return color
-endfunction
-
-function! s:get_array(fg, bg, opts)
-  let fg = a:fg
-  let bg = a:bg
-  return has('gui_running')
-        \ ? [ fg, bg, '', '', join(a:opts, ',') ]
-        \ : [ '', '', fg, bg, join(a:opts, ',') ]
-endfunction
-
 function! airline#themes#get_highlight(group, ...)
-  let fg = s:get_syn(a:group, 'fg')
-  let bg = s:get_syn(a:group, 'bg')
-  return s:get_array(fg, bg, a:000)
+  return call('airline#highlighter#get_highlight', [a:group] + a:000)
 endfunction
 
 function! airline#themes#get_highlight2(fg, bg, ...)
-  let fg = s:get_syn(a:fg[0], a:fg[1])
-  let bg = s:get_syn(a:bg[0], a:bg[1])
-  return s:get_array(fg, bg, a:000)
+  return call('airline#highlighter#get_highlight2', [a:fg, a:bg] + a:000)
 endfunction
 
 function! airline#themes#patch(palette)
+  for mode in keys(a:palette)
+    if !has_key(a:palette[mode], 'airline_warning')
+      let a:palette[mode]['airline_warning'] = [ '#000000', '#df5f00', 232, 166 ]
+    endif
+  endfor
+
   " this is a pretty heavy handed, but it works...
   " basically, look for the 'airline_file' group and copy the bg
   " colors from 'airline_c' into it.

autoload/airline/themes/badwolf.vim

@@ -44,4 +44,6 @@ let g:airline#themes#badwolf#palette.visual_modified = {
 
 
 let g:airline#themes#badwolf#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#badwolf#palette.inactive_modified = {
+      \ 'airline_c': [ s:V1[1]   , ''        , s:V1[3]   , ''        , ''     ] }
 

autoload/airline/themes/base16.vim

@@ -59,6 +59,9 @@ function! s:load_constant()
   " Inactive window
   let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:cterm_dark_gray, s:cterm_med_gray_hi, '']
   let g:airline#themes#base16#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+  let g:airline#themes#base16#palette.inactive_modified = {
+        \ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
+        \ }
 endfunction
 
 function! s:load_dynamic()
@@ -95,6 +98,9 @@ function! s:load_dynamic()
 
   let s:IA = airline#themes#get_highlight2(['NonText', 'fg'], ['CursorLine', 'bg'])
   let g:airline#themes#base16#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+  let g:airline#themes#base16#palette.inactive_modified = {
+        \ 'airline_c': [ group[0], '', group[2], '', '' ]
+        \ }
 endfunction
 
 if get(g:, 'airline#themes#base16#constant', 0)

autoload/airline/themes/bubblegum.vim

@@ -58,4 +58,7 @@ let g:airline#themes#bubblegum#palette.visual_modified = copy(g:airline#themes#b
 " Inactive window
 let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:cterm_dark_gray, s:cterm_med_gray_hi, '']
 let g:airline#themes#bubblegum#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#bubblegum#palette.inactive_modified = {
+      \ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
+      \ }
 

autoload/airline/themes/dark.vim

@@ -84,6 +84,9 @@ let s:IA1 = [ '#4e4e4e' , '#1c1c1c' , 239 , 234 , '' ]
 let s:IA2 = [ '#4e4e4e' , '#262626' , 239 , 235 , '' ]
 let s:IA3 = [ '#4e4e4e' , '#303030' , 239 , 236 , '' ]
 let g:airline#themes#dark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3, s:file)
+let g:airline#themes#dark#palette.inactive_modified = {
+      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
+      \ }
 
 
 " Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp

autoload/airline/themes/jellybeans.vim

@@ -41,6 +41,7 @@ function! s:generate()
   " And of course, you can always do it manually as well.
   let s:IA = [ '#444444', '#1c1c1c', 237, 234 ]
   let g:airline#themes#jellybeans#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+  let g:airline#themes#jellybeans#palette.inactive_modified = g:airline#themes#jellybeans#palette.normal_modified
 endfunction
 
 call s:generate()

autoload/airline/themes/laederon.vim

@@ -54,4 +54,6 @@ let g:airline#themes#laederon#palette.visual_modified = {
 
 
 let g:airline#themes#laederon#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#laederon#palette.inactive_modified = {
+      \ 'airline_c' : [ s:V1[1] , ''      , s:V1[3] , ''      , '' ] }
 

autoload/airline/themes/light.vim

@@ -40,4 +40,7 @@ let s:IA1 = [ '#666666' , '#b2b2b2' , 242 , 249 , '' ]
 let s:IA2 = [ '#8a8a8a' , '#d0d0d0' , 245 , 252 , '' ]
 let s:IA3 = [ '#a8a8a8' , '#ffffff' , 248 , 255 , '' ]
 let g:airline#themes#light#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3, s:file)
+let g:airline#themes#light#palette.inactive_modified = {
+      \ 'airline_c': [ '#df0000' , ''        , 160     , ''      , ''     ] ,
+      \ }
 

autoload/airline/themes/luna.vim

@@ -40,6 +40,9 @@ let g:airline#themes#luna#palette.visual_modified = {
 
 let s:IA = [ '#4e4e4e' , '#002b2b' , 59 , 23 , '' ]
 let g:airline#themes#luna#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#luna#palette.inactive_modified = {
+      \ 'airline_c': [ '#450000' , ''        , 52      , ''      , ''     ] ,
+      \ }
 
 
 if !get(g:, 'loaded_ctrlp', 0)
@@ -49,3 +52,11 @@ let g:airline#themes#luna#palette.ctrlp = airline#extensions#ctrlp#generate_colo
       \ [ '#ffffff' , '#002b2b' , 231 , 23 , ''     ] ,
       \ [ '#ffffff' , '#005252' , 231 , 36 , ''     ] ,
       \ [ '#ffffff' , '#973d45' , 231 , 95 , ''     ] )
+
+let g:airline#themes#luna#palette.tabline = {
+      \ 'airline_tab':  ['#2aa198', '#003f3f',  231, 29, ''],
+      \ 'airline_tabsel':  ['#ffffff', '#2e8b57',  231, 36, ''],
+      \ 'airline_tabtype':  ['#ffffff', '#005252',  231, 36, ''],
+      \ 'airline_tabfill':  ['#ffffff', '#002b2b',  231, 23, ''],
+      \ 'airline_tabmod':  ['#ffffff', '#780000',  231, 88, ''],
+      \ }

autoload/airline/themes/molokai.vim

@@ -47,6 +47,9 @@ let g:airline#themes#molokai#palette.visual_modified = {
 " Inactive
 let s:IA = [ '#1b1d1e' , '#465457' , 233 , 67 , '' ]
 let g:airline#themes#molokai#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#molokai#palette.inactive_modified = {
+      \ 'airline_c': [ '#f8f8f0' , ''        , 253 , ''  , '' ] ,
+      \ }
 
 
 " CtrlP

autoload/airline/themes/serene.vim

@@ -0,0 +1,41 @@
+let g:airline#themes#serene#palette = {}
+
+let s:guibg = '#080808'
+let s:termbg = 232
+let s:termsep = 236
+let s:guisep = '#303030'
+
+let s:file = [ '#ff0000' , s:guibg , 160 , s:termbg , '' ]
+let s:N1 = [ '#00dfff' , s:guibg , 45 , s:termbg ]
+let s:N2 = [ '#ff5f00' , s:guibg, 202 , s:termbg ]
+let s:N3 = [ '#767676' , s:guibg, 7 , s:termbg ]
+
+let g:airline#themes#serene#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#serene#palette.normal_modified = {
+      \ 'airline_c': [ '#df0000' , s:guibg, 160     , s:termbg    , ''     ] ,
+      \ }
+
+let s:I1 = [ '#5fff00' , s:guibg, 82 , s:termbg ]
+let s:I2 = [ '#ff5f00' , s:guibg, 202 , s:termbg ]
+let s:I3 = [ '#767676' , s:guibg, 7 , s:termbg ]
+let g:airline#themes#serene#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#serene#palette.insert_modified = copy(g:airline#themes#serene#palette.normal_modified)
+let g:airline#themes#serene#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+let g:airline#themes#serene#palette.replace = {
+      \ 'airline_a': [ s:I1[0]   , '#af0000' , s:I1[2] , 124     , ''     ] ,
+      \ }
+let g:airline#themes#serene#palette.replace_modified = copy(g:airline#themes#serene#palette.normal_modified)
+
+let s:V1 = [ '#dfdf00' , s:guibg, 184 , s:termbg ]
+let s:V2 = [ '#ff5f00' , s:guibg, 202 , s:termbg ]
+let s:V3 = [ '#767676' , s:guibg, 243 , s:termbg ]
+let g:airline#themes#serene#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#serene#palette.visual_modified = copy(g:airline#themes#serene#palette.normal_modified)
+
+let s:IA  = [ '#4e4e4e' , s:guibg  , 239 , s:termbg  , '' ]
+let s:IA2 = [ '#4e4e4e' , s:guisep , 239 , s:termsep , '' ]
+let g:airline#themes#serene#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA2, s:IA2, s:file)
+let g:airline#themes#serene#palette.inactive_modified = copy(g:airline#themes#serene#palette.normal_modified)

autoload/airline/themes/simple.vim

@@ -41,4 +41,7 @@ let g:airline#themes#simple#palette.visual_modified = copy(g:airline#themes#simp
 let s:IA  = [ '#4e4e4e' , s:guibg  , 239 , s:termbg  , '' ]
 let s:IA2 = [ '#4e4e4e' , s:guibg2 , 239 , s:termbg2 , '' ]
 let g:airline#themes#simple#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA2, s:IA2, s:file)
+let g:airline#themes#simple#palette.inactive_modified = {
+      \ 'airline_c': [ '#df0000', '', 160, '', '' ] ,
+      \ }
 

autoload/airline/themes/solarized.vim

@@ -55,10 +55,11 @@ function! s:generate()
   endif
 
   " Insert mode
-  let s:I1 = [s:N1[0], s:green, 'bold']
   if s:reduced
+    let s:I1 = [s:N1[0], s:green, 'bold']
     let s:I2 = s:N2
   else
+    let s:I1 = [s:N1[0], s:orange, 'bold']
     if s:background == 'dark'
       let s:I2 = [s:base00, s:color236, '']
     else
@@ -70,11 +71,12 @@ function! s:generate()
   let s:IM = s:NM
 
   " Visual mode
-  let s:V1 = [s:N1[0], s:orange, 'bold']
   if s:reduced
+    let s:V1 = [s:N1[0], s:orange, 'bold']
     let s:V2 = s:N2
     let s:V3 = s:N3
   else
+    let s:V1 = [s:N1[0], s:green, 'bold']
     let s:V2 = s:I2
     let s:V3 = s:I3
   endif
@@ -105,6 +107,8 @@ function! s:generate()
         \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
         \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
         \ s:NFa)
+  let g:airline#themes#solarized#palette.inactive_modified = {
+        \ 'airline_c': [s:NM[0].g, '', s:NM[0].t, '', s:NM[2]]}
 
   let g:airline#themes#solarized#palette.normal = airline#themes#generate_color_map(
         \ [s:N1[0].g, s:N1[1].g, s:N1[0].t, s:N1[1].t, s:N1[2]],
@@ -112,13 +116,17 @@ function! s:generate()
         \ [s:N3[0].g, s:N3[1].g, s:N3[0].t, s:N3[1].t, s:N3[2]],
         \ s:NFa)
 
-  let g:airline#themes#solarized#palette.normal.airline_warningmsg = [
+  let g:airline#themes#solarized#palette.normal.airline_warning = [
         \ s:NW[0].g, s:NW[1].g, s:NW[0].t, s:NW[1].t, s:NW[2]]
 
   let g:airline#themes#solarized#palette.normal_modified = {
         \ 'airline_c': [s:NM[0].g, s:NM[1].g,
         \ s:NM[0].t, s:NM[1].t, s:NM[2]]}
 
+  let g:airline#themes#solarized#palette.normal_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+
   let g:airline#themes#solarized#palette.insert = airline#themes#generate_color_map(
         \ [s:I1[0].g, s:I1[1].g, s:I1[0].t, s:I1[1].t, s:I1[2]],
         \ [s:I2[0].g, s:I2[1].g, s:I2[0].t, s:I2[1].t, s:I2[2]],
@@ -138,6 +146,14 @@ function! s:generate()
   let g:airline#themes#solarized#palette.visual_modified = {
         \ 'airline_c': [s:VM[0].g, s:VM[1].g,
         \ s:VM[0].t, s:VM[1].t, s:VM[2]]}
+
+  let g:airline#themes#solarized#palette.tabline = {}
+
+  let g:airline#themes#solarized#palette.tabline.airline_tab = [
+        \ s:I2[0].g, s:I2[1].g, s:I2[0].t, s:I2[1].t, s:I2[2]]
+
+  let g:airline#themes#solarized#palette.tabline.airline_tabtype = [
+        \ s:N2[0].g, s:N2[1].g, s:N2[0].t, s:N2[1].t, s:N2[2]]
 endfunction
 
 call s:generate()

autoload/airline/themes/tomorrow.vim

@@ -33,6 +33,9 @@ function! s:generate()
 
   let s:IA = airline#themes#get_highlight2(['NonText', 'fg'], ['CursorLine', 'bg'])
   let g:airline#themes#tomorrow#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+  let g:airline#themes#tomorrow#palette.inactive_modified = {
+        \ 'airline_c': [ group[0], '', group[2], '', '' ]
+        \ }
 endfunction
 
 call s:generate()

autoload/airline/themes/ubaryd.vim

@@ -55,4 +55,6 @@ let g:airline#themes#ubaryd#palette.visual_modified = {
       \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
 
 let g:airline#themes#ubaryd#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#ubaryd#palette.inactive_modified = {
+      \ 'airline_c' : [ s:V1[1] , ''      , s:V1[3] , ''      , '' ] }
 

autoload/airline/themes/wombat.vim

@@ -77,6 +77,8 @@ let g:airline#themes#wombat#palette.insert_paste = {
 
 
 let g:airline#themes#wombat#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#wombat#palette.inactive_modified = {
+    \ 'airline_c': [ s:N4[0] , ''      , s:N4[1] , ''      , ''     ] }
 
 
 if !get(g:, 'loaded_ctrlp', 0)

autoload/airline/themes/zenburn.vim

@@ -0,0 +1,45 @@
+let g:airline#themes#zenburn#palette = {}
+
+function! s:generate()
+  let s:N1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Folded', 'fg'], 'bold')
+  let s:N2 = airline#themes#get_highlight('Folded')
+  let s:N3 = airline#themes#get_highlight('NonText')
+  let s:file = airline#themes#get_highlight('Constant')
+
+  let g:airline#themes#zenburn#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+  let s:Nmod = airline#themes#get_highlight('Comment')
+  let g:airline#themes#zenburn#palette.normal_modified = {
+        \ 'airline_c': s:Nmod
+        \ }
+
+  let s:I1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['String', 'fg'], 'bold')
+  let s:I2 = airline#themes#get_highlight2(['String', 'fg'], ['Folded', 'bg'])
+  let s:I3 = s:N3
+  let g:airline#themes#zenburn#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+  let g:airline#themes#zenburn#palette.insert_modified = g:airline#themes#zenburn#palette.normal_modified
+
+  let s:R1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Comment', 'fg'], 'bold')
+  let s:R2 = airline#themes#get_highlight2(['Comment', 'fg'], ['Folded', 'bg'])
+  let s:R3 = s:N3
+  let g:airline#themes#zenburn#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
+  let g:airline#themes#zenburn#palette.replace_modified = g:airline#themes#zenburn#palette.normal_modified
+
+  let s:V1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Identifier', 'fg'], 'bold')
+  let s:V2 = airline#themes#get_highlight2(['Identifier', 'fg'], ['Folded', 'bg'])
+  let s:V3 = s:N3
+  let g:airline#themes#zenburn#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+  let g:airline#themes#zenburn#palette.visual_modified = g:airline#themes#zenburn#palette.normal_modified
+
+  let s:IA = airline#themes#get_highlight('NonText')
+  let g:airline#themes#zenburn#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+  let g:airline#themes#zenburn#palette.inactive_modified = {
+        \ 'airline_c': s:Nmod
+        \ }
+endfunction
+
+call s:generate()
+augroup airline_zenburn
+  autocmd!
+  autocmd ColorScheme * call <sid>generate()
+augroup END
+

autoload/airline/util.vim

@@ -1,6 +1,29 @@
 " MIT License. Copyright (c) 2013 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+call airline#init#bootstrap()
+
+function! airline#util#wrap(text, minwidth)
+  if a:minwidth > 0 && winwidth(0) < a:minwidth
+    return ''
+  endif
+  return a:text
+endfunction
+
+function! airline#util#append(text, minwidth)
+  if a:minwidth > 0 && winwidth(0) < a:minwidth
+    return ''
+  endif
+  return empty(a:text) ? '' : '  '.g:airline_left_alt_sep.' '.a:text
+endfunction
+
+function! airline#util#prepend(text, minwidth)
+  if a:minwidth > 0 && winwidth(0) < a:minwidth
+    return ''
+  endif
+  return empty(a:text) ? '' : a:text.' '.g:airline_right_alt_sep.' '
+endfunction
+
 if v:version >= 704
   function! airline#util#getwinvar(winnr, key, def)
     return getwinvar(a:winnr, a:key, a:def)

doc/airline.txt

@@ -1,4 +1,4 @@
-*airline.txt*  Lean and mean statusline that's light as air
+*airline.txt*  Lean and mean status/tabline that's light as air
                    _                       _      _ _                        ~
             __   _(_)_ __ ___         __ _(_)_ __| (_)_ __   ___             ~
             \ \ / / | '_ ` _ \ _____ / _` | | '__| | | '_ \ / _ \            ~
@@ -50,7 +50,7 @@ values):
   let g:airline_detect_paste=1
 <
 * enable iminsert detection >
-  let g:airline_detect_iminsert=1
+  let g:airline_detect_iminsert=0
 <
 * determine whether inactive windows should have the left section collapsed to
   only the filename of that buffer.  >
@@ -71,7 +71,8 @@ values):
     endif
   endfunction
 <
-* enable/disable usage of patched powerline font symbols >
+* enable/disable automatic population of the `g:airline_symbols` dictionary
+  with powerline symbols.
   let g:airline_powerline_fonts=0
 <
 * define the set of text to display for each mode.  >
@@ -122,54 +123,58 @@ CUSTOMIZATION                                        *airline-customization*
 
 The following are some unicode symbols for customizing the left/right
 separators, as well as the powerline font glyths.
+
+Note: You must define the dictionary first before setting values: >
+  let g:airline_symbols = {}
 >
   " unicode symbols
   let g:airline_left_sep = '»'
   let g:airline_left_sep = '▶'
   let g:airline_right_sep = '«'
   let g:airline_right_sep = '◀'
-  let g:airline_linecolumn_prefix = '␊ '
-  let g:airline_linecolumn_prefix = '␤ '
-  let g:airline_linecolumn_prefix = '¶ '
-  let g:airline#extensions#branch#symbol = '⎇ '
-  let g:airline#extensions#paste#symbol = 'ρ'
-  let g:airline#extensions#paste#symbol = 'Þ'
-  let g:airline#extensions#paste#symbol = '∥'
-  let g:airline#extensions#whitespace#symbol = 'Ξ'
+  let g:airline_symbols.linenr = '␊'
+  let g:airline_symbols.linenr = '␤'
+  let g:airline_symbols.linenr = '¶'
+  let g:airline_symbols.branch = '⎇'
+  let g:airline_symbols.paste = 'ρ'
+  let g:airline_symbols.paste = 'Þ'
+  let g:airline_symbols.paste = '∥'
+  let g:airline_symbols.whitespace = 'Ξ'
 
   " powerline symbols
   let g:airline_left_sep = ''
   let g:airline_left_alt_sep = ''
   let g:airline_right_sep = ''
   let g:airline_right_alt_sep = ''
-  let g:airline#extensions#branch#symbol = ' '
-  let g:airline#extensions#readonly#symbol = ''
-  let g:airline_linecolumn_prefix = ' '
+  let g:airline_symbols.branch = ''
+  let g:airline_symbols.readonly = ''
+  let g:airline_symbols.linenr = ''
 
   " old vim-powerline symbols
   let g:airline_left_sep = '⮀'
   let g:airline_left_alt_sep = '⮁'
   let g:airline_right_sep = '⮂'
   let g:airline_right_alt_sep = '⮃'
-  let g:airline#extensions#branch#symbol = '⭠'
-  let g:airline#extensions#readonly#symbol = '⭤'
-  let g:airline_linecolumn_prefix = '⭡'
+  let g:airline_symbols.branch = '⭠'
+  let g:airline_symbols.readonly = '⭤'
+  let g:airline_symbols.linenr = '⭡'
 <
 
 For more intricate customizations, you can replace the predefined sections
 with the usual statusline syntax.
 
-Note: Many of these settings can also be controlled with |airline-configuration|
-variables, which is useful for sections which by default host more than one
-extension.
+Note: If you define any section variables it will replace the default values
+entirely.  If you want to disable only certain parts of a section you can try
+using variables defined in the |airline-configuration| or |airline_extensions|
+section.
 >
   variable names                default contents
   ----------------------------------------------------------------------------
-  let g:airline_section_a       (the mode/paste indicator)
-  let g:airline_section_b       (the fugitive/lawrencium branch indicator)
+  let g:airline_section_a       (mode, paste, iminsert)
+  let g:airline_section_b       (hunks, branch)
   let g:airline_section_c       (bufferline or filename)
   let g:airline_section_gutter  (readonly, csv)
-  let g:airline_section_x       (tagbar, virtualenv, filetype)
+  let g:airline_section_x       (tagbar, filetype, virtualenv)
   let g:airline_section_y       (fileencoding, fileformat)
   let g:airline_section_z       (percentage, line number, column number)
   let g:airline_section_warning (syntastic, whitespace)
@@ -185,7 +190,32 @@ EXTENSIONS                                              *airline-extensions*
 Most extensions are enabled by default and lazily loaded when the
 corresponding plugin (if any) is detected.
 
-                                                            *airline-branch*
+-------------------------------------                      *airline-default*
+The default extension understands all of the `g:` variables in the
+|airline-configuration| section, however it also has some more fine-tuned
+configuration values that you can use.
+
+* control which sections get truncated and at what width. >
+  let g:airline#extensions#default#section_truncate_width = {
+      \ 'b': 88,
+      \ 'x': 60,
+      \ 'y': 88,
+      \ 'z': 45,
+      \ })
+
+  " Note: set to an empty dictionary to disable truncation.
+  let g:airline#extensions#default#section_truncate_width = {}
+<
+-------------------------------------                   *airline-bufferline*
+vim-bufferline <https://github.com/bling/vim-bufferline>
+
+* enable/disable bufferline integration >
+  let g:airline#extensions#bufferline#enabled = 1
+<
+* determine whether bufferline will overwrite customization variables >
+  let g:airline#extensions#bufferline#overwrite_variables = 1
+<
+-------------------------------------                       *airline-branch*
 fugitive.vim <https://github.com/tpope/vim-fugitive>
 lawrencium   <https://bitbucket.org/ludovicchabant/vim-lawrencium>
 
@@ -195,19 +225,25 @@ lawrencium   <https://bitbucket.org/ludovicchabant/vim-lawrencium>
 * change the text for when no branch is detected >
   let g:airline#extensions#branch#empty_message = ''
 <
-                                                         *airline-syntastic*
+-------------------------------------                    *airline-syntastic*
 syntastic <https://github.com/scrooloose/syntastic>
 
 * enable/disable syntastic integration >
   let g:airline#extensions#syntastic#enabled = 1
 <
-                                                            *airline-tagbar*
+-------------------------------------                       *airline-tagbar*
 tagbar <https://github.com/majutsushi/>
 
 * enable/disable tagbar integration >
   let g:airline#extensions#tagbar#enabled = 1
 <
-                                                               *airline-csv*
+* change how tags are displayed (:help tagbar-statusline) >
+  let g:airline#extensions#tagbar#flags = ''  "default
+  let g:airline#extensions#tagbar#flags = 'f'
+  let g:airline#extensions#tagbar#flags = 's'
+  let g:airline#extensions#tagbar#flags = 'p'
+<
+-------------------------------------                          *airline-csv*
 csv.vim <https://github.com/chrisbra/csv.vim>
 
 * enable/disable csv integration for displaying the current column. >
@@ -217,11 +253,11 @@ csv.vim <https://github.com/chrisbra/csv.vim>
   let g:airline#extensions#csv#column_display = 'Number' (default)
   let g:airline#extensions#csv#column_display = 'Name'
 <
-                                                             *airline-hunks*
+-------------------------------------                        *airline-hunks*
 vim-gitgutter <https://github.com/airblade/vim-gitgutter>
 vim-signify <https://github.com/mhinz/vim-signify>
 
-* enable/disable showing a summary of changed hunks under source control.
+* enable/disable showing a summary of changed hunks under source control. >
   let g:airline#extensions#hunks#enabled = 1
 <
 * enable/disable showing only non-zero hunks. >
@@ -230,7 +266,23 @@ vim-signify <https://github.com/mhinz/vim-signify>
 * set hunk count symbols. >
   let g:airline#extensions#hunks#hunk_symbols = ['+', '~', '-']
 <
-                                                        *airline-whitespace*
+-------------------------------------                        *airline-ctrlp*
+ctrlp <https://github.com/kien/ctrlp.vim>
+
+* configure which mode colors should ctrlp window use (takes effect
+  only if the active airline theme doesn't define ctrlp colors) >
+  let g:airline#extensions#ctrlp#color_template = 'insert' (default)
+  let g:airline#extensions#ctrlp#color_template = 'normal'
+  let g:airline#extensions#ctrlp#color_template = 'visual'
+  let g:airline#extensions#ctrlp#color_template = 'replace'
+<
+-------------------------------------                   *airline-virtualenv*
+virtualenv <https://github.com/jmcantrell/vim-virtualenv>
+
+* enable/disable virtualenv integration >
+  let g:airline#extensions#virtualenv#enabled = 1
+<
+-------------------------------------                   *airline-whitespace*
 * enable/disable detection of whitespace errors. >
   let g:airline#extensions#whitespace#enabled = 1
 <
@@ -247,30 +299,127 @@ vim-signify <https://github.com/mhinz/vim-signify>
   let g:airline#extensions#whitespace#trailing_format = 'trailing[%s]'
   let g:airline#extensions#whitespace#mixed_indent_format = 'mixed-indent[%s]'
 <
-                                                             *airline-ctrlp*
-ctrlp <https://github.com/kien/ctrlp.vim>
-
-* configure which mode colors should ctrlp window use (takes effect
-  only if the active airline theme doesn't define ctrlp colors) >
-  let g:airline#extensions#ctrlp#color_template = 'insert' (default)
-  let g:airline#extensions#ctrlp#color_template = 'normal'
-  let g:airline#extensions#ctrlp#color_template = 'visual'
-  let g:airline#extensions#ctrlp#color_template = 'replace'
+-------------------------------------                      *airline-tabline*
+* enable/disable enhanced tabline. >
+  let g:airline#extensions#tabline#enabled = 0
 <
-                                                        *airline-virtualenv*
+* enable/disable displaying buffers with a single tab. >
+  let g:airline#extensions#tabline#show_buffers = 1
+<
+* configure filename match rules to exclude from the tabline. >
+  let g:airline#extensions#tabline#excludes = []
+<
+* configure how numbers are calculated in tab mode. >
+  let g:airline#extensions#tabline#tab_nr_type = 0 " # of splits (default)
+  let g:airline#extensions#tabline#tab_nr_type = 1 " tab number
+<
+* defines the name of a formatter for how buffer names are displayed. >
+  let g:airline#extensions#tabline#formatter = 'default'
 
-virtualenv <https://github.com/jmcantrell/vim-virtualenv>
+  " here is how you can define a 'foo' formatter:
+  function! airline#extensions#tabline#formatters#foo(bufnr, buffers)
+    return fnamemodify(bufname(a:bufnr), ':t')
+  endfunction
+  let g:airline#extensions#tabline#formatter = 'foo'
+<
+  Note: the following variables are only used by the 'default' formatter.
 
-* enable/disable virtualenv integration >
-  let g:airline#extensions#virtualenv#enabled = 1
+    * configure whether buffer numbers should be shown. >
+      let g:airline#extensions#tabline#buffer_nr_show = 0
+<
+    * configure how buffer numbers should be formatted with |printf|. >
+      let g:airline#extensions#tabline#buffer_nr_format = '%s: '
+<
+    * configure the formatting of filenames (see |filename-modifiers|). >
+      let g:airline#extensions#tabline#fnamemod = ':p:.'
+<
+    * configure collapsing parent directories in buffer name. >
+      let g:airline#extensions#tabline#fnamecollapse = 1
+<
+* configure the minimum number of buffers needed to show the tabline. >
+  let g:airline#extensions#tabline#buffer_min_count = 0
+<
+  Note: this setting only applies to a single tab.
+
+* configure separators for the tabline only. >
+  let g:airline#extensions#tabline#left_sep = ''
+  let g:airline#extensions#tabline#left_alt_sep = ''
+  let g:airline#extensions#tabline#right_sep = ''
+  let g:airline#extensions#tabline#right_alt_sep = ''
+<
+Note: Enabling this extension will modify |showtabline| and |guioptions|.
+
+==============================================================================
+ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
+
+The defaults will accomodate the mass majority of users with minimal
+configuration. However, if you want to reposition sections or contents you can
+do so with built-in helper functions, which makes it possible to create
+sections in a more declarative style.
+
+-------------------------------------                        *airline-parts*
+A part is something that contains metadata that eventually gets rendered into
+the statusline. You can define parts that contain constant strings or
+functions. Defining parts is needed if you want to use features like automatic
+insertion of separators or hiding based on window width.
+
+For example, this is how you would define a part function: >
+  call airline#parts#define_function('foo', 'GetFooText')
+<
+Here is how you would define a part that is visible only if the window width
+greater than a minimum width. >
+  call airline#parts#define_minwidth('foo', 50)
+<
+Parts can be configured to be visible conditionally. >
+  call airline#parts#define_condition('foo', 'getcwd() =~ "work_dir"')
+<
+Note: Part definitions are combinative; e.g. the two examples above modify the
+same `foo` part.
+
+Note: Look at the source code and tests for the full API.
+
+-------------------------------------                     *airline-sections*
+Once a part is defined, you can use helper functions to generate the
+statuslines for each section. For example, to use the part above, we could
+define a section like this: >
+  function! AirlineInit()
+    let g:airline_section_a = airline#section#create(['mode', ' ', 'foo'])
+    let g:airline_section_b = airline#section#create_left(['ffenc','file'])
+    let g:airline_section_c = airline#section#create(['%{getcwd()}'])
+  endfunction
+  autocmd VimEnter * call AirlineInit()
+<
+This will create a section with the `mode`, followed by a space, and our `foo`
+part in section `a`. Section `b` will have two parts with a left-side
+separator. And section `c` will contain the current path. You may notice that
+the space and cwd are not defined parts. For convenience, if a part of that
+key does not exist, it will be inserted as is. The unit tests will be a good
+resource for possibilities.
+
+Note: The use of `VimEnter` is important, because most extensions are lazily
+loaded, so we must give them a chance to define their parts before we can use
+them.
+
+Note: The `airline#section#create` function and friends will do its best to
+create a section with the appropriate separators, but it only works for
+function and text parts. Special |statusline| items like %f or raw/undefined
+parts will not work as it is not possible to inspect their widths/contents
+before rendering to the statusline.
 
 ==============================================================================
 FUNCREFS                                                  *airline-funcrefs*
 
 vim-airline internally uses funcrefs to integrate with third party plugins,
-and you can tap into this functionality to extend it for you needs.
+and you can tap into this functionality to extend it for you needs. This is
+the most powerful way to customize the statusline, and sometimes it may be
+easier to go this route than the above methods.
 
-                                                       *add_statusline_func*
+Every section can have two values. The default value is the global `g:`
+variable which is used in the absense of a `w:` value. This makes it very easy
+to override only certain parts of the statusline by only defining window-local
+variables for a subset of all sections.
+
+-------------------------------------                  *add_statusline_func*
 The following is an example of how you can extend vim-airline to support a
 new plugin. >
   function! MyPlugin(...)
@@ -283,7 +432,10 @@ new plugin. >
   endfunction
   call airline#add_statusline_func('MyPlugin')
 <
-                                                    *remove_statusline_func*
+Notice that only the left side of the statusline is overwritten. This means
+the right side (the line/column numbers, etc) will be intact.
+
+-------------------------------------               *remove_statusline_func*
 You can also remove a function as well, which is useful for when you want a
 temporary override. >
   call airline#remove_statusline_func('MyPlugin')
@@ -293,33 +445,39 @@ temporary override. >
 PIPELINE                                                  *airline-pipeline*
 
 Sometimes you want to do more than just use overrides.  The statusline funcref
-is invoked and passed a bunch of arguments.  The first of these arguments is
-the statusline builder.  You can use this to build completely custom
-statuslines to your liking.  Here is an example: >
+is invoked and passed two arguments.  The first of these arguments is the
+statusline builder.  You can use this to build completely custom statuslines
+to your liking.  Here is an example: >
 >
   function! MyPlugin(...)
     " first variable is the statusline builder
     let builder = a:1
 
-    " build and set the statusline
     " WARNING: the API for the builder is not finalized and may change
     call builder.add_section('Normal', '%f')
     call builder.add_section('WarningMsg', '%{getcwd()}')
-    call setwinvar(winnr(), '&statusline', builder.build())
+    call builder.split()
+    call builder.add_section('airline_z', '%p%%')
 
-    return -1
+    " tell the core to use the contents of the builder
+    return 1
   endfunction
 <
+The above example uses various some example highlight groups to demonstrate
+that you can use any combination from the loaded colorscheme. However, if
+you want colors to change between modes, you should use one of the section
+highlight groups, e.g. `airline_a` and `airline_b`.
+
 The second variable is the context, which is a dictionary containing various
 values such as whether the statusline is active or not, and the window number.
 >
   context = {
     'winnr': 'the window number for the statusline',
     'active': 'whether the window is active or not',
+    'bufnr': 'the current buffer for this window',
   }
 <
-
-                                             *airline-pipeline-return-codes*
+-------------------------------------        *airline-pipeline-return-codes*
 The pipeline accepts various return codes and can be used to determine the
 next action.  The following are the supported codes: >
    0   the default, continue on with the next funcref
@@ -332,13 +490,6 @@ funcref from executing.
 ==============================================================================
 WRITING EXTENSIONS                              *airline-writing-extensions*
 
-The basic idea is that the statusline is rendered with a series of overrides.
-For each section that the algorithm encounters, it will first check to see if
-there is a window-local variable of the section.  If it exists, the value will
-be used, otherwise, the global variable of the section will be used.  This
-means it is possible to override only one or two sections of the statusline.
-See |add_statusline_func| for an example of a simple extension.
-
 For contributions into the plugin, here are the following guidelines:
 
 1.  For simple |&filetype| checks, they can be added directly into the
@@ -358,7 +509,8 @@ For contributions into the plugin, here are the following guidelines:
   b.  Configuration variables for the extension should reside in the
       extension, e.g. `g:airline#extensions#foo_plugin#bar_variable`.
 
-See the source of |example.vim| for a working extension.
+See the source of |example.vim| for documented code of how to write one.
+Looking at the other extensions is also a good resource.
 
 ==============================================================================
 WRITING THEMES                                              *airline-themes*

plugin/airline.vim

@@ -6,57 +6,7 @@ if &cp || v:version < 702 || (exists('g:loaded_airline') && g:loaded_airline)
 endif
 let g:loaded_airline = 1
 
-function! s:check_defined(variable, default)
-  if !exists(a:variable)
-    let {a:variable} = a:default
-  endif
-endfunction
-
-if exists('g:airline_enable_fugitive') || exists('g:airline_fugitive_prefix')
-  echom 'The g:airline_enable_fugitive and g:airline_fugitive_prefix variables are obsolete. Please read the documentation about the branch extension.'
-endif
-
-call s:check_defined('g:airline_left_sep', get(g:, 'airline_powerline_fonts', 0)?"":">")
-call s:check_defined('g:airline_left_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"":">")
-call s:check_defined('g:airline_right_sep', get(g:, 'airline_powerline_fonts', 0)?"":"<")
-call s:check_defined('g:airline_right_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"":"<")
-call s:check_defined('g:airline_detect_modified', 1)
-call s:check_defined('g:airline_detect_paste', 1)
-call s:check_defined('g:airline_linecolumn_prefix', get(g:, 'airline_powerline_fonts', 0)?' ':':')
-call s:check_defined('g:airline_inactive_collapse', 1)
-call s:check_defined('g:airline_exclude_filenames', ['DebuggerWatch','DebuggerStack','DebuggerStatus'])
-call s:check_defined('g:airline_exclude_filetypes', [])
-call s:check_defined('g:airline_exclude_preview', 0)
-
-call s:check_defined('g:airline_mode_map', {
-      \ '__' : '------',
-      \ 'n'  : 'NORMAL',
-      \ 'i'  : 'INSERT',
-      \ 'R'  : 'REPLACE',
-      \ 'v'  : 'VISUAL',
-      \ 'V'  : 'V-LINE',
-      \ 'c'  : 'COMMAND',
-      \ '' : 'V-BLOCK',
-      \ 's'  : 'SELECT',
-      \ 'S'  : 'S-LINE',
-      \ '' : 'S-BLOCK',
-      \ })
-
-call s:check_defined('g:airline_theme_map', {
-      \ 'Tomorrow.*': 'tomorrow',
-      \ 'mo[l|n]okai': 'molokai',
-      \ 'wombat.*': 'wombat',
-      \ '.*solarized.*': 'solarized',
-      \ })
-
-call s:check_defined('g:airline_section_a', '%{get(w:, "airline_current_mode", "")}')
-call s:check_defined('g:airline_section_b', '')
-call s:check_defined('g:airline_section_c', '%f%m')
-call s:check_defined('g:airline_section_gutter', '%=')
-call s:check_defined('g:airline_section_x', "%{strlen(&filetype)>0?&filetype:''}")
-call s:check_defined('g:airline_section_y', "%{strlen(&fenc)>0?&fenc:''}%{strlen(&ff)>0?'['.&ff.']':''}")
-call s:check_defined('g:airline_section_z', '%3p%% '.g:airline_linecolumn_prefix.'%3l:%3c')
-call s:check_defined('g:airline_section_warning', '__')
+" autocmd VimEnter * call airline#deprecation#check()
 
 let s:airline_initialized = 0
 let s:airline_theme_defined = 0
@@ -64,7 +14,9 @@ function! s:init()
   if !s:airline_initialized
     let s:airline_initialized = 1
 
+    call airline#init#bootstrap()
     call airline#extensions#load()
+    call airline#init#sections()
 
     let s:airline_theme_defined = exists('g:airline_theme')
     if s:airline_theme_defined || !airline#switch_matching_theme()
@@ -104,6 +56,7 @@ function! s:airline_toggle()
       au!
     augroup END
     augroup! airline
+
     if exists("s:stl")
       let &stl = s:stl
     endif
@@ -118,7 +71,7 @@ function! s:airline_toggle()
       autocmd CmdwinLeave * call airline#remove_statusline_func('airline#cmdwinenter')
 
       autocmd ColorScheme * call <sid>on_colorscheme_changed()
-      autocmd WinEnter,BufWinEnter,FileType,BufUnload,ShellCmdPost *
+      autocmd VimEnter,WinEnter,BufWinEnter,FileType,BufUnload,VimResized *
             \ call <sid>on_window_changed()
 
       autocmd BufWritePost */autoload/airline/themes/*.vim

t/airline.vim

@@ -0,0 +1,87 @@
+let g:airline_theme = 'dark'
+call airline#init#bootstrap()
+call airline#init#sections()
+source plugin/airline.vim
+
+function! MyFuncref(...)
+  call a:1.add_raw('hello world')
+  return 1
+endfunction
+
+function! MyIgnoreFuncref(...)
+  return -1
+endfunction
+
+function! MyAppend1(...)
+  call a:1.add_raw('hello')
+endfunction
+
+function! MyAppend2(...)
+  call a:1.add_raw('world')
+endfunction
+
+describe 'airline'
+  before
+    let g:airline_statusline_funcrefs = []
+  end
+
+  it 'should run user funcrefs first'
+    call airline#add_statusline_func('MyFuncref')
+    let &statusline = ''
+    call airline#update_statusline()
+    Expect airline#statusline(1) =~ 'hello world'
+  end
+
+  it 'should not change the statusline with -1'
+    call airline#add_statusline_funcref(function('MyIgnoreFuncref'))
+    let &statusline = 'foo'
+    call airline#update_statusline()
+    Expect &statusline == 'foo'
+  end
+
+  it 'should support multiple chained funcrefs'
+    call airline#add_statusline_func('MyAppend1')
+    call airline#add_statusline_func('MyAppend2')
+    call airline#update_statusline()
+    Expect airline#statusline(1) =~ 'helloworld'
+  end
+
+  it 'should allow users to redefine sections'
+    let g:airline_section_a = airline#section#create(['mode', 'mode'])
+    call airline#update_statusline()
+    Expect airline#statusline(1) =~ '%{airline#util#wrap(airline#parts#mode(),0)}%{airline#util#wrap(airline#parts#mode(),0)}'
+  end
+
+  it 'should remove funcrefs properly'
+    let c = len(g:airline_statusline_funcrefs)
+    call airline#add_statusline_func('MyIgnoreFuncref')
+    call airline#remove_statusline_func('MyIgnoreFuncref')
+    Expect len(g:airline_statusline_funcrefs) == c
+  end
+
+  it 'should overwrite the statusline with active and inactive splits'
+    wincmd s
+    Expect airline#statusline(1) !~ 'inactive'
+    Expect airline#statusline(2) =~ 'inactive'
+    wincmd c
+  end
+
+  it 'should collapse the inactive split if the variable is set true'
+    let g:airline_inactive_collapse = 1
+    wincmd s
+    Expect getwinvar(2, '&statusline') !~ 'airline#parts#mode'
+    wincmd c
+  end
+
+  it 'should not collapse the inactive split if the variable is set false'
+    let g:airline_inactive_collapse = 0
+    wincmd s
+    Expect getwinvar(2, '&statusline') != 'airline#parts#mode'
+    wincmd c
+  end
+
+  it 'should include check_mode'
+    Expect airline#statusline(1) =~ 'airline#check_mode'
+  end
+end
+

t/builder.vim

@@ -0,0 +1,54 @@
+call airline#init#bootstrap()
+
+describe 'active builder'
+  before
+    let s:builder = airline#builder#new({'active': 1})
+  end
+
+  it 'should start with an empty statusline'
+    let stl = s:builder.build()
+    Expect stl == ''
+  end
+
+  it 'should transition colors from one to the next'
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.add_section('NonText', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Normal#hello%#Normal_to_NonText#>%#NonText#world'
+  end
+
+  it 'should split left/right sections'
+    call s:builder.split()
+    let stl = s:builder.build()
+    Expect stl =~ '%='
+  end
+
+  it 'after split, sections use the right separator'
+    call s:builder.split()
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.add_section('NonText', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Normal#hello%#Normal_to_NonText#<%#NonText#world'
+  end
+
+  it 'should not repeat the same highlight group'
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.add_section('Normal', 'hello')
+    let stl = s:builder.build()
+    Expect stl == '%#Normal#hello>hello'
+  end
+end
+
+describe 'inactive builder'
+  before
+    let s:builder = airline#builder#new({'active': 0})
+  end
+
+  it 'should transition colors from one to the next'
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.add_section('NonText', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Normal_inactive#hello%#Normal_to_NonText_inactive#>%#NonText_inactive#world'
+  end
+end
+

t/commands.vim

@@ -0,0 +1,29 @@
+call airline#init#bootstrap()
+call airline#init#sections()
+
+source plugin/airline.vim
+
+describe 'commands'
+  it 'should toggle off and on'
+    execute 'AirlineToggle'
+    Expect exists('#airline') to_be_false
+    execute 'AirlineToggle'
+    Expect exists('#airline') to_be_true
+  end
+
+  it 'should toggle whitespace off and on'
+    call airline#extensions#load()
+    execute 'AirlineToggleWhitespace'
+    Expect exists('#airline_whitespace') to_be_false
+    execute 'AirlineToggleWhitespace'
+    Expect exists('#airline_whitespace') to_be_true
+  end
+
+  it 'should display theme name with no args'
+    execute 'AirlineTheme simple'
+    Expect g:airline_theme == 'simple'
+    execute 'AirlineTheme dark'
+    Expect g:airline_theme == 'dark'
+  end
+end
+

t/extensions_default.vim

@@ -0,0 +1,31 @@
+call airline#init#bootstrap()
+call airline#init#sections()
+source plugin/airline.vim
+
+describe 'default'
+  before
+    let s:builder = airline#builder#new({'active': 1})
+  end
+
+  it 'should use the layout'
+    let g:airline#extensions#default#layout = [
+          \ [ 'c', 'a', 'b', 'warning' ],
+          \ [ 'x', 'z', 'y' ]
+          \ ]
+    call airline#extensions#default#apply(s:builder, { 'winnr': 1, 'active': 1 })
+    let stl = s:builder.build()
+    Expect stl =~ 'airline_c_to_airline_a'
+    Expect stl =~ 'airline_a_to_airline_b'
+    Expect stl =~ 'airline_b_to_airline_warning'
+    Expect stl =~ 'airline_x_to_airline_z'
+    Expect stl =~ 'airline_z_to_airline_y'
+  end
+
+  it 'should only render warning section in active splits'
+    wincmd s
+    Expect airline#statusline(1) =~ 'warning'
+    Expect airline#statusline(2) !~ 'warning'
+    wincmd c
+  end
+end
+

t/highligher.vim

@@ -0,0 +1,10 @@
+describe 'highlighter'
+  it 'should create separator highlight groups'
+    hi Foo1 ctermfg=1 ctermbg=2
+    hi Foo2 ctermfg=3 ctermbg=4
+    call airline#highlighter#add_separator('Foo1', 'Foo2', 0)
+    let hl = airline#highlighter#get_highlight('Foo1_to_Foo2')
+    Expect hl == [ '', '', '4', '2', '' ]
+  end
+end
+

t/init.vim

@@ -0,0 +1,67 @@
+let s:sections = ['a', 'b', 'c', 'gutter', 'x', 'y', 'z', 'warning']
+
+function! s:clear()
+  for key in s:sections
+    unlet! g:airline_section_{key}
+  endfor
+endfunction
+
+describe 'init'
+  before
+    call s:clear()
+    call airline#init#bootstrap()
+    call airline#init#sections()
+  end
+
+  after
+    call s:clear()
+  end
+
+  it 'section a should have mode, paste, iminsert'
+    Expect g:airline_section_a =~ 'mode'
+    Expect g:airline_section_a =~ 'paste'
+    Expect g:airline_section_a =~ 'iminsert'
+  end
+
+  it 'section b should be blank because no extensions are installed'
+    Expect g:airline_section_b == ''
+  end
+
+  it 'section c should be file'
+    Expect g:airline_section_c == '%<%f%m'
+  end
+
+  it 'section x should be filetype'
+    Expect g:airline_section_x == '%{airline#util#wrap(airline#parts#filetype(),0)}'
+  end
+
+  it 'section y should be fenc and ff'
+    Expect g:airline_section_y =~ 'ff'
+    Expect g:airline_section_y =~ 'fenc'
+  end
+
+  it 'section z should be line numbers'
+    Expect g:airline_section_z =~ '%3p%%'
+    Expect g:airline_section_z =~ '%3l'
+    Expect g:airline_section_z =~ '%3c'
+  end
+
+  it 'should not redefine sections already defined'
+    for s in s:sections
+      let g:airline_section_{s} = s
+    endfor
+    call airline#init#bootstrap()
+    for s in s:sections
+      Expect g:airline_section_{s} == s
+    endfor
+  end
+
+  it 'all default statusline extensions should be blank'
+    Expect airline#parts#get('hunks').raw == ''
+    Expect airline#parts#get('branch').raw == ''
+    Expect airline#parts#get('tagbar').raw == ''
+    Expect airline#parts#get('syntastic').raw == ''
+    Expect airline#parts#get('whitespace').raw == ''
+  end
+end
+

t/parts.vim

@@ -0,0 +1,34 @@
+describe 'parts'
+  it 'overwrites existing values'
+    call airline#parts#define('foo', { 'test': '123' })
+    Expect airline#parts#get('foo').test == '123'
+    call airline#parts#define('foo', { 'test': '321' })
+    Expect airline#parts#get('foo').test == '321'
+  end
+
+  it 'can define a function part'
+    call airline#parts#define_function('func', 'bar')
+    Expect airline#parts#get('func').function == 'bar'
+  end
+
+  it 'can define a text part'
+    call airline#parts#define_text('text', 'bar')
+    Expect airline#parts#get('text').text == 'bar'
+  end
+
+  it 'can define a raw part'
+    call airline#parts#define_raw('raw', 'bar')
+    Expect airline#parts#get('raw').raw == 'bar'
+  end
+
+  it 'can define a minwidth'
+    call airline#parts#define_minwidth('mw', 123)
+    Expect airline#parts#get('mw').minwidth == 123
+  end
+
+  it 'can define a condition'
+    call airline#parts#define_condition('part', '1')
+    Expect airline#parts#get('part').condition == '1'
+  end
+end
+

t/section.vim

@@ -0,0 +1,66 @@
+call airline#init#bootstrap()
+call airline#extensions#load()
+
+function! SectionSpec()
+endfunction
+
+describe 'section'
+  before
+    call airline#parts#define_text('text', 'text')
+    call airline#parts#define_raw('raw', 'raw')
+    call airline#parts#define_function('func', 'SectionSpec')
+  end
+
+  it 'should create sections with no separators'
+    let s = airline#section#create(['text', 'raw', 'func'])
+    Expect s == '%{airline#util#wrap("text",0)}raw%{airline#util#wrap(SectionSpec(),0)}'
+  end
+
+  it 'should create left sections with separators'
+    let s = airline#section#create_left(['text', 'text'])
+    Expect s == '%{airline#util#wrap("text",0)}%{airline#util#append("text",0)}'
+  end
+
+  it 'should create right sections with separators'
+    let s = airline#section#create_right(['text', 'text'])
+    Expect s == '%{airline#util#prepend("text",0)}%{airline#util#wrap("text",0)}'
+  end
+
+  it 'should prefix with highlight group if provided'
+    call airline#parts#define('hi', {
+          \ 'raw': 'hello',
+          \ 'highlight': 'hlgroup',
+          \ })
+    let s = airline#section#create(['hi'])
+    Expect s == '%#hlgroup#hello'
+  end
+
+  it 'should parse out a section from the distro'
+    let s = airline#section#create(['whitespace'])
+    Expect s =~ 'airline#extensions#whitespace#check'
+  end
+
+  it 'should use parts as is if they are not found'
+    let s = airline#section#create(['asdf', 'func'])
+    Expect s == 'asdf%{airline#util#wrap(SectionSpec(),0)}'
+  end
+
+  it 'should force add separators for raw and missing keys'
+    let s = airline#section#create_left(['asdf', 'raw'])
+    Expect s == 'asdf > raw'
+    let s = airline#section#create_left(['asdf', 'aaaa', 'raw'])
+    Expect s == 'asdf > aaaa > raw'
+    let s = airline#section#create_right(['raw', '%f'])
+    Expect s == 'raw < %f'
+    let s = airline#section#create_right(['%t', 'asdf', '%{getcwd()}'])
+    Expect s == '%t < asdf < %{getcwd()}'
+  end
+
+  it 'should empty out parts that do not pass their condition'
+    call airline#parts#define_text('conditional', 'conditional')
+    call airline#parts#define_condition('conditional', '0')
+    let s = airline#section#create(['conditional'])
+    Expect s == '%{0 ? airline#util#wrap("conditional",0) : ""}'
+  end
+end
+

t/themes.vim

@@ -0,0 +1,37 @@
+describe 'themes'
+  after
+    highlight clear Foo
+    highlight clear Normal
+  end
+
+  it 'should extract correct colors'
+    highlight Foo ctermfg=1 ctermbg=2
+    let colors = airline#themes#get_highlight('Foo')
+    Expect colors[2] == '1'
+    Expect colors[3] == '2'
+  end
+
+  it 'should extract from normal if colors unavailable'
+    highlight Normal ctermfg=100 ctermbg=200
+    highlight Foo ctermbg=2
+    let colors = airline#themes#get_highlight('Foo')
+    Expect colors[2] == '100'
+    Expect colors[3] == '2'
+  end
+
+  it 'should flip target group if it is reversed'
+    highlight Foo ctermbg=222 ctermfg=103 term=reverse
+    let colors = airline#themes#get_highlight('Foo')
+    Expect colors[2] == '222'
+    Expect colors[3] == '103'
+  end
+
+  it 'should pass args through correctly'
+    let hl = airline#themes#get_highlight('Foo', 'bold', 'italic')
+    Expect hl == ['', '', 0, 1, 'bold,italic']
+
+    let hl = airline#themes#get_highlight2(['Foo','bg'], ['Foo','fg'], 'italic', 'bold')
+    Expect hl == ['', '', 1, 0, 'italic,bold']
+  end
+end
+

t/util.vim

@@ -0,0 +1,54 @@
+call airline#init#bootstrap()
+
+function! Util1()
+  let g:count += 1
+endfunction
+function! Util2()
+  let g:count += 2
+endfunction
+function! Util3(...)
+  let g:count = a:0
+endfunction
+
+describe 'util'
+  before
+    let g:count = 0
+  end
+
+  it 'has append wrapper function'
+    Expect airline#util#append('', 0) == ''
+    Expect airline#util#append('1', 0) == '  > 1'
+  end
+
+  it 'has prepend wrapper function'
+    Expect airline#util#prepend('', 0) == ''
+    Expect airline#util#prepend('1', 0) == '1 < '
+  end
+
+  it 'has getwinvar function'
+    Expect airline#util#getwinvar(1, 'asdf', '123') == '123'
+    call setwinvar(1, 'vspec', 'is cool')
+    Expect airline#util#getwinvar(1, 'vspec', '') == 'is cool'
+  end
+
+  it 'has exec funcrefs helper functions'
+    call airline#util#exec_funcrefs([function('Util1'), function('Util2')])
+    Expect g:count == 3
+
+    call airline#util#exec_funcrefs([function('Util3')], 1, 2, 3, 4)
+    Expect g:count == 4
+  end
+
+  it 'should ignore minwidth if less than 0'
+    Expect airline#util#append('foo', -1) == '  > foo'
+    Expect airline#util#prepend('foo', -1) == 'foo < '
+    Expect airline#util#wrap('foo', -1) == 'foo'
+  end
+
+  it 'should return empty if winwidth() > minwidth'
+    Expect airline#util#append('foo', 99999) == ''
+    Expect airline#util#prepend('foo', 99999) == ''
+    Expect airline#util#wrap('foo', 99999) == ''
+  end
+end
+