cache open buffers into a dictionary and loop over the keys

Add support for 24-bit colors with +termtruecolor flag

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (C) 2013 Bailey Ling
+Copyright (C) 2013-2015 Bailey Ling
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the "Software"),

README.md

@@ -7,12 +7,12 @@ Lean & mean status/tabline for vim that's light as air.
 # 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].
+*  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], [eclim][34], [lawrencium][21], [virtualenv][31], [tmuxline][35].
 *  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.
+*  Extensive suite of themes for popular color schemes 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.
+*  The master branch tries to be as stable as possible, and new features are merged in only after they have gone through a [full regression test][33].
 *  Unit testing suite.
 
 ## Straightforward customization
@@ -37,6 +37,11 @@ This is disabled by default; add the following to your vimrc to enable the exten
 
     let g:airline#extensions#tabline#enabled = 1
 
+Separators can be configured independently for the tabline, so here is how you can define "straight" tabs:
+
+    let g:airline#extensions#tabline#left_sep = ' '
+    let g:airline#extensions#tabline#left_alt_sep = '|'
+
 ## 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).
@@ -62,6 +67,12 @@ vim-airline integrates with a variety of plugins out of the box.  These extensio
 #### [virtualenv][31]
 ![image](https://f.cloud.github.com/assets/390964/1022566/cf81f830-0d98-11e3-904f-cf4fe3ce201e.png)
 
+#### [tmuxline][35]
+![image](https://f.cloud.github.com/assets/1532071/1559276/4c28fbac-4fc7-11e3-90ef-7e833d980f98.gif)
+
+#### [promptline][36]
+![airline-promptline-sc](https://f.cloud.github.com/assets/1532071/1871900/7d4b28a0-789d-11e3-90e4-16f37269981b.gif)
+
 ## Extras
 
 vim-airline also supplies some supplementary stand-alone extensions.  In addition to the tabline extension mentioned earlier, there is also:
@@ -77,6 +88,10 @@ Every section is composed of parts, and you can reorder and reconfigure them at
 
 ![image](https://f.cloud.github.com/assets/306502/1073278/f291dd4c-14a3-11e3-8a83-268e2753f97d.png)
 
+Sections can contain accents, which allows for very granular control of visuals (see configuration [here](https://github.com/bling/vim-airline/issues/299#issuecomment-25772886)).
+
+![image](https://f.cloud.github.com/assets/306502/1195815/4bfa38d0-249d-11e3-823e-773cfc2ca894.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.
@@ -103,10 +118,11 @@ This plugin follows the standard runtime path structure, and as such it can be i
 
 *  [Pathogen][11]
   *  `git clone https://github.com/bling/vim-airline ~/.vim/bundle/vim-airline`
+  *  Remember to run `:Helptags` to generate help tags
 *  [NeoBundle][12]
   *  `NeoBundle 'bling/vim-airline'`
 *  [Vundle][13]
-  *  `Bundle 'bling/vim-airline'`
+  *  `Plugin 'bling/vim-airline'`
 *  [VAM][22]
   *  `call vam#ActivateAddons([ 'vim-airline' ])`
 *  manual
@@ -116,6 +132,9 @@ This plugin follows the standard runtime path structure, and as such it can be i
 
 `:help airline`
 
+The default setting of 'laststatus' is for the statusline to not appear until a split is created. If you want it to appear all the time, add the following to your vimrc:
+`set laststatus=2`
+
 # Integrating with powerline fonts
 
 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.
@@ -126,6 +145,16 @@ Finally, you can add the convenience variable `let g:airline_powerline_fonts = 1
 
 Solutions to common problems can be found in the [Wiki][27].
 
+# Performance
+
+Whoa!  Everything got slow all of a sudden...
+
+vim-airline strives to make it easy to use out of the box, which means that by default it will look for all compatible plugins that you have installed and enable the relevant extension.
+
+Many optimizations have been made such that the majority of users will not see any performance degradation, but it can still happen.  For example, users who routinely open very large files may want to disable the tagbar extension, as it can be very expensive to scan for the name of the current function.
+
+The [minivimrc][7] project has some helper mappings to troubleshoot performance related issues.
+
 # Screenshots
 
 A full list of screenshots for various themes can be found in the [Wiki][14].
@@ -149,7 +178,7 @@ Contributions and pull requests are welcome.  Please take note of the following
 
 # License
 
-MIT License. Copyright (c) 2013 Bailey Ling.
+MIT License. Copyright (c) 2013-2015 Bailey Ling.
 
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/bling/vim-airline/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
@@ -173,7 +202,7 @@ MIT License. Copyright (c) 2013 Bailey Ling.
 [17]: https://github.com/mbbill/undotree
 [18]: https://github.com/scrooloose/nerdtree
 [19]: https://github.com/majutsushi/tagbar
-[20]: https://powerline.readthedocs.org/en/latest/fontpatching.html
+[20]: https://powerline.readthedocs.org/en/master/installation.html#patched-fonts
 [21]: https://bitbucket.org/ludovicchabant/vim-lawrencium
 [22]: https://github.com/MarcWeber/vim-addon-manager
 [23]: https://github.com/altercation/solarized
@@ -187,3 +216,6 @@ MIT License. Copyright (c) 2013 Bailey Ling.
 [31]: https://github.com/jmcantrell/vim-virtualenv
 [32]: https://github.com/chriskempson/base16-vim
 [33]: https://github.com/bling/vim-airline/wiki/Test-Plan
+[34]: http://eclim.org
+[35]: https://github.com/edkolev/tmuxline.vim
+[36]: https://github.com/edkolev/promptline.vim

autoload/airline.vim

@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let g:airline_statusline_funcrefs = get(g:, 'airline_statusline_funcrefs', [])
@@ -11,6 +11,12 @@ function! airline#add_statusline_func(name)
 endfunction
 
 function! airline#add_statusline_funcref(function)
+  if index(g:airline_statusline_funcrefs, a:function) >= 0
+    echohl WarningMsg
+    echo 'The airline statusline funcref '.string(a:function).' has already been added.'
+    echohl NONE
+    return
+  endif
   call add(g:airline_statusline_funcrefs, a:function)
 endfunction
 
@@ -26,13 +32,11 @@ function! airline#add_inactive_statusline_func(name)
 endfunction
 
 function! airline#load_theme()
-  call airline#highlighter#load_theme()
-  call airline#extensions#load_theme()
-endfunction
+  if exists('*airline#themes#{g:airline_theme}#refresh')
+    call airline#themes#{g:airline_theme}#refresh()
+  endif
 
-function! airline#switch_theme(name)
-  let g:airline_theme = a:name
-  let palette = g:airline#themes#{g:airline_theme}#palette "also lazy loads the theme
+  let palette = g:airline#themes#{g:airline_theme}#palette
   call airline#themes#patch(palette)
 
   if exists('g:airline_theme_patch_func')
@@ -40,9 +44,29 @@ function! airline#switch_theme(name)
     call Fn(palette)
   endif
 
+  call airline#highlighter#load_theme()
+  call airline#extensions#load_theme()
+endfunction
+
+function! airline#switch_theme(name)
+  try
+    let palette = g:airline#themes#{a:name}#palette "also lazy loads the theme
+    let g:airline_theme = a:name
+  catch
+    echohl WarningMsg | echo 'The specified theme cannot be found.' | echohl NONE
+    if exists('g:airline_theme')
+      return
+    else
+      let g:airline_theme = 'dark'
+    endif
+  endtry
+
   let w:airline_lastmode = ''
   call airline#update_statusline()
   call airline#load_theme()
+
+  " this is required to prevent clobbering the startup info message, i don't know why...
+  call airline#check_mode(winnr())
 endfunction
 
 function! airline#switch_matching_theme()
@@ -65,6 +89,9 @@ endfunction
 
 function! airline#update_statusline()
   for nr in filter(range(1, winnr('$')), 'v:val != winnr()')
+    if airline#util#getwinvar(nr, 'airline_disabled', 0)
+      continue
+    endif
     call setwinvar(nr, 'airline_active', 0)
     let context = { 'winnr': nr, 'active': 0, 'bufnr': winbufnr(nr) }
     call s:invoke_funcrefs(context, s:inactive_funcrefs)
@@ -96,7 +123,12 @@ function! s:invoke_funcrefs(context, funcrefs)
 endfunction
 
 function! airline#statusline(winnr)
-  return '%{airline#check_mode('.a:winnr.')}'.s:contexts[a:winnr].line
+  if has_key(s:contexts, a:winnr)
+    return '%{airline#check_mode('.a:winnr.')}'.s:contexts[a:winnr].line
+  endif
+
+  " in rare circumstances this happens...see #276
+  return ''
 endfunction
 
 function! airline#check_mode(winnr)
@@ -119,16 +151,18 @@ function! airline#check_mode(winnr)
     let w:airline_current_mode = get(g:airline_mode_map, '__')
   endif
 
-  if g:airline_detect_modified
-    if &modified
-      call add(l:mode, 'modified')
-    endif
+  if g:airline_detect_modified && &modified
+    call add(l:mode, 'modified')
   endif
 
   if g:airline_detect_paste && &paste
     call add(l:mode, 'paste')
   endif
 
+  if &readonly || ! &modifiable
+    call add(l:mode, 'readonly')
+  endif
+
   let mode_string = join(l:mode)
   if get(w:, 'airline_lastmode', '') != mode_string
     call airline#highlighter#highlight_modified_inactive(context.bufnr)

autoload/airline/builder.vim

@@ -1,49 +1,127 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:prototype = {}
 
 function! s:prototype.split(...)
-  let self._side = 0
-  let self._line .= '%#'.self._curgroup.'#'.(a:0 ? a:1 : '%=')
+  call add(self._sections, ['|', a:0 ? a:1 : '%='])
+endfunction
+
+function! s:prototype.add_section_spaced(group, contents)
+  call self.add_section(a:group, (g:airline_symbols.space).a:contents.(g:airline_symbols.space))
 endfunction
 
 function! s:prototype.add_section(group, contents)
-  if self._curgroup != ''
-    if self._curgroup == a:group
-      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 ? self._context.left_sep : self._context.right_sep
-    endif
-  endif
-
-  if self._curgroup != a:group
-    let self._line .= '%#'.a:group.'#'
-  endif
-
-  let self._line .= a:contents
-  let self._curgroup = a:group
+  call add(self._sections, [a:group, a:contents])
 endfunction
 
 function! s:prototype.add_raw(text)
-  let self._line .= a:text
+  call add(self._sections, ['', a:text])
+endfunction
+
+function! s:get_prev_group(sections, i)
+  let x = a:i - 1
+  while x >= 0
+    let group = a:sections[x][0]
+    if group != '' && group != '|'
+      return group
+    endif
+    let x = x - 1
+  endwhile
+  return ''
 endfunction
 
 function! s:prototype.build()
+  let side = 1
+  let line = ''
+  let i = 0
+  let length = len(self._sections)
+  let split = 0
+
+  while i < length
+    let section = self._sections[i]
+    let group = section[0]
+    let contents = section[1]
+    let prev_group = s:get_prev_group(self._sections, i)
+
+    if group == ''
+      let line .= contents
+    elseif group == '|'
+      let side = 0
+      let line .= contents
+      let split = 1
+    else
+      if prev_group == ''
+        let line .= '%#'.group.'#'
+      elseif split
+        let line .= s:get_transitioned_seperator(self, prev_group, group, side)
+        let split = 0
+      else
+        let line .= s:get_seperator(self, prev_group, group, side)
+      endif
+      let line .= s:get_accented_line(self, group, contents)
+    endif
+
+    let i = i + 1
+  endwhile
+
   if !self._context.active
-    let self._line = substitute(self._line, '%#.\{-}\ze#', '\0_inactive', 'g')
+    let line = substitute(line, '%#.\{-}\ze#', '\0_inactive', 'g')
   endif
-  return self._line
+  return line
+endfunction
+
+function! s:should_change_group(group1, group2)
+  if a:group1 == a:group2
+    return 0
+  endif
+  let color1 = airline#highlighter#get_highlight(a:group1)
+  let color2 = airline#highlighter#get_highlight(a:group2)
+  if has('gui_running') || (has("termtruecolor") && &guicolors == 1)
+    return color1[1] != color2[1] || color1[0] != color2[0]
+  else
+    return color1[3] != color2[3] || color1[2] != color2[2]
+  endif
+endfunction
+
+function! s:get_transitioned_seperator(self, prev_group, group, side)
+  let line = ''
+  call airline#highlighter#add_separator(a:prev_group, a:group, a:side)
+  let line .= '%#'.a:prev_group.'_to_'.a:group.'#'
+  let line .= a:side ? a:self._context.left_sep : a:self._context.right_sep
+  let line .= '%#'.a:group.'#'
+  return line
+endfunction
+
+function! s:get_seperator(self, prev_group, group, side)
+  if s:should_change_group(a:prev_group, a:group)
+    return s:get_transitioned_seperator(a:self, a:prev_group, a:group, a:side)
+  else
+    return a:side ? a:self._context.left_alt_sep : a:self._context.right_alt_sep
+  endif
+endfunction
+
+function! s:get_accented_line(self, group, contents)
+  if a:self._context.active
+    let contents = []
+    let content_parts = split(a:contents, '__accent')
+    for cpart in content_parts
+      let accent = matchstr(cpart, '_\zs[^#]*\ze')
+      call add(contents, cpart)
+    endfor
+    let line = join(contents, a:group)
+    let line = substitute(line, '__restore__', a:group, 'g')
+  else
+    let line = substitute(a:contents, '%#__accent[^#]*#', '', 'g')
+    let line = substitute(line, '%#__restore__#', '', 'g')
+  endif
+  return line
 endfunction
 
 function! airline#builder#new(context)
   let builder = copy(s:prototype)
   let builder._context = a:context
-  let builder._side = 1
-  let builder._curgroup = ''
-  let builder._line = ''
+  let builder._sections = []
 
   call extend(builder._context, {
         \ 'left_sep': g:airline_left_sep,

autoload/airline/debug.vim

@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 function! airline#debug#profile1()

autoload/airline/deprecation.vim

@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 function! airline#deprecation#check()
@@ -19,6 +19,7 @@ function! airline#deprecation#check()
         \ [ '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' ],
+        \ [ 'g:airline_enable_eclim', 'g:airline#extensions#eclim#enabled' ],
         \ ]
   for test in tests
     if exists(test[0])

autoload/airline/extensions.vim

@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:ext = {}
@@ -20,13 +20,12 @@ endfunction
 let s:script_path = tolower(resolve(expand('<sfile>:p:h')))
 
 let s:filetype_overrides = {
-      \ 'netrw': [ 'netrw', '%f' ],
       \ 'nerdtree': [ 'NERD', '' ],
       \ 'gundo': [ 'Gundo', '' ],
-      \ 'diff': [ 'diff', '' ],
       \ 'vimfiler': [ 'vimfiler', '%{vimfiler#get_status_string()}' ],
       \ 'minibufexpl': [ 'MiniBufExplorer', '' ],
       \ 'startify': [ 'startify', '' ],
+      \ 'vim-plug': [ 'Plugins', '' ],
       \ }
 
 let s:filetype_regex_overrides = {}
@@ -50,25 +49,20 @@ endfunction
 function! airline#extensions#apply_left_override(section1, section2)
   let w:airline_section_a = a:section1
   let w:airline_section_b = a:section2
-  let w:airline_section_c = ''
+  let w:airline_section_c = airline#section#create(['readonly'])
   let w:airline_render_left = 1
   let w:airline_render_right = 0
 endfunction
 
 let s:active_winnr = -1
 function! airline#extensions#apply(...)
+  let s:active_winnr = winnr()
+
   if s:is_excluded_window()
     return -1
   endif
 
-  let s:active_winnr = winnr()
-
-  if &buftype == 'quickfix'
-    let w:airline_section_a = '%q'
-    let w:airline_section_b = ''
-    let w:airline_section_c = ''
-    let w:airline_section_x = ''
-  elseif &buftype == 'help'
+  if &buftype == 'help'
     call airline#extensions#apply_left_override('Help', '%f')
     let w:airline_section_x = ''
     let w:airline_section_y = ''
@@ -127,10 +121,16 @@ 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()
 
+  call airline#extensions#quickfix#init(s:ext)
+
   if get(g:, 'loaded_unite', 0)
     call airline#extensions#unite#init(s:ext)
   endif
 
+  if exists(':NetrwSettings')
+    call airline#extensions#netrw#init(s:ext)
+  endif
+
   if get(g:, 'loaded_vimfiler', 0)
     let g:vimfiler_force_overwrite_statusline = 0
   endif
@@ -148,7 +148,7 @@ function! airline#extensions#load()
   endif
 
   if (get(g:, 'airline#extensions#hunks#enabled', 1) && get(g:, 'airline_enable_hunks', 1))
-        \ && (exists('g:loaded_signify') || exists('g:loaded_gitgutter'))
+        \ && (exists('g:loaded_signify') || exists('g:loaded_gitgutter') || exists('g:loaded_changes'))
     call airline#extensions#hunks#init(s:ext)
   endif
 
@@ -168,7 +168,8 @@ function! airline#extensions#load()
   endif
 
   if (get(g:, 'airline#extensions#branch#enabled', 1) && get(g:, 'airline_enable_branch', 1))
-        \ && (get(g:, 'loaded_fugitive', 0) || get(g:, 'loaded_lawrencium', 0))
+        \ && (exists('*fugitive#head') || exists('*lawrencium#statusline') ||
+        \     (get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')))
     call airline#extensions#branch#init(s:ext)
   endif
 
@@ -177,10 +178,14 @@ function! airline#extensions#load()
     call airline#extensions#bufferline#init(s:ext)
   endif
 
-  if get(g:, 'virtualenv_loaded', 0) && get(g:, 'airline#extensions#virtualenv#enabled', 1)
+  if isdirectory($VIRTUAL_ENV) && get(g:, 'airline#extensions#virtualenv#enabled', 1)
     call airline#extensions#virtualenv#init(s:ext)
   endif
 
+  if (get(g:, 'airline#extensions#eclim#enabled', 1) && exists(':ProjectCreate'))
+    call airline#extensions#eclim#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)
@@ -194,18 +199,44 @@ function! airline#extensions#load()
     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")
-    " 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
+  if get(g:, 'airline#extensions#tmuxline#enabled', 1) && exists(':Tmuxline')
+    call airline#extensions#tmuxline#init(s:ext)
+  endif
+
+  if get(g:, 'airline#extensions#promptline#enabled', 1) && exists(':PromptlineSnapshot') && len(get(g:, 'airline#extensions#promptline#snapshot_file', ''))
+    call airline#extensions#promptline#init(s:ext)
+  endif
+
+  if get(g:, 'airline#extensions#nrrwrgn#enabled', 1) && exists(':NR') == 2
+      call airline#extensions#nrrwrgn#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#capslock#enabled', 1) && exists('*CapsLockStatusline'))
+    call airline#extensions#capslock#init(s:ext)
+  endif
+
+  if (get(g:, 'airline#extensions#windowswap#enabled', 1) && get(g:, 'loaded_windowswap', 0))
+    call airline#extensions#windowswap#init(s:ext)
+  endif
+
+  if !get(g:, 'airline#extensions#disable_rtp_load', 0)
+    " load all other extensions, which are not part of the default distribution.
+    " (autoload/airline/extensions/*.vim outside of our s:script_path).
+    for file in split(globpath(&rtp, "autoload/airline/extensions/*.vim"), "\n")
+      " 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
+        endif
+        try
+          call airline#extensions#{name}#init(s:ext)
+        catch
+        endtry
       endif
-      call airline#extensions#{name}#init(s:ext)
-    endif
-  endfor
+    endfor
+  endif
 endfunction
 

autoload/airline/extensions/branch.vim

@@ -1,42 +1,115 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
-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', g:airline_symbols.branch)
-
 let s:has_fugitive = exists('*fugitive#head')
-let s:has_fugitive_detect = exists('*fugitive#detect')
 let s:has_lawrencium = exists('*lawrencium#statusline')
+let s:has_vcscommand = get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')
 
-function! airline#extensions#branch#get_head()
-  let head = ''
+if !s:has_fugitive && !s:has_lawrencium && !s:has_vcscommand
+  finish
+endif
+
+let s:git_dirs = {}
+function! s:get_git_branch(path)
+  if has_key(s:git_dirs, a:path)
+    return s:git_dirs[a:path]
+  endif
+
+  let dir = fugitive#extract_git_dir(a:path)
+  if empty(dir)
+    let name = ''
+  else
+    try
+      let line = join(readfile(dir . '/HEAD'))
+      if strpart(line, 0, 16) == 'ref: refs/heads/'
+        let name = strpart(line, 16)
+      else
+        " raw commit hash
+        let name = strpart(line, 0, 7)
+      endif
+    catch
+      let name = ''
+    endtry
+  endif
+
+  let s:git_dirs[a:path] = name
+  return name
+endfunction
+
+function! airline#extensions#branch#head()
+  if exists('b:airline_head') && !empty(b:airline_head)
+    return b:airline_head
+  endif
+
+  let b:airline_head = ''
+  let found_fugitive_head = 0
 
   if s:has_fugitive && !exists('b:mercurial_dir')
-    let head = fugitive#head()
+    let b:airline_head = fugitive#head(7)
+    let found_fugitive_head = 1
 
-    if empty(head) && s:has_fugitive_detect && !exists('b:git_dir')
-      call fugitive#detect(getcwd())
-      let head = fugitive#head()
+    if empty(b:airline_head) && !exists('b:git_dir')
+      let b:airline_head = s:get_git_branch(expand("%:p:h"))
     endif
   endif
 
-  if empty(head)
+  if empty(b:airline_head)
     if s:has_lawrencium
-      let head = lawrencium#statusline()
+      let b:airline_head = lawrencium#statusline()
     endif
   endif
 
-  return empty(head) || !s:check_in_path()
-        \ ? s:empty_message
-        \ : printf('%s%s', empty(s:symbol) ? '' : s:symbol.' ', head)
+  if empty(b:airline_head)
+    if s:has_vcscommand
+      call VCSCommandEnableBufferSetup()
+      if exists('b:VCSCommandBufferInfo')
+        let b:airline_head = get(b:VCSCommandBufferInfo, 0, '')
+      endif
+    endif
+  endif
+
+  if empty(b:airline_head) || !found_fugitive_head && !s:check_in_path()
+    let b:airline_head = ''
+  endif
+
+  if exists("g:airline#extensions#branch#displayed_head_limit")
+    let w:displayed_head_limit = g:airline#extensions#branch#displayed_head_limit
+    if len(b:airline_head) > w:displayed_head_limit - 1
+      let b:airline_head = b:airline_head[0:w:displayed_head_limit - 1].'…'
+    endif
+  endif
+
+  return b:airline_head
+endfunction
+
+function! airline#extensions#branch#get_head()
+  let head = airline#extensions#branch#head()
+  let empty_message = get(g:, 'airline#extensions#branch#empty_message',
+      \ get(g:, 'airline_branch_empty_message', ''))
+  let symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch)
+  return empty(head)
+        \ ? empty_message
+        \ : printf('%s%s', empty(symbol) ? '' : symbol.(g:airline_symbols.space), 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 bufferpath = resolve(fnamemodify(expand('%'), ':p'))
+
+    if !filereadable(root) "not a file
+      " if .git is a directory, it's the old submodule format
+      if match(root, '\.git$') >= 0
+        let root = expand(fnamemodify(root, ':h'))
+      else
+        " else it's the newer format, and we need to guesstimate
+        let pattern = '\.git\(\\\|\/\)modules\(\\\|\/\)'
+        if match(root, pattern) >= 0
+          let root = substitute(root, pattern, '', '')
+        endif
+      endif
+    endif
+
     let b:airline_file_in_root = stridx(bufferpath, root) > -1
   endif
   return b:airline_file_in_root
@@ -46,5 +119,5 @@ function! airline#extensions#branch#init(ext)
   call airline#parts#define_function('branch', 'airline#extensions#branch#get_head')
 
   autocmd BufReadPost * unlet! b:airline_file_in_root
+  autocmd CursorHold,ShellCmdPost,CmdwinLeave * unlet! b:airline_head
 endfunction
-

autoload/airline/extensions/bufferline.vim

@@ -1,6 +1,10 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+if !exists('*bufferline#get_status_string')
+  finish
+endif
+
 let s:overwrite = get(g:, 'airline#extensions#bufferline#overwrite_variables', 1)
 
 function! airline#extensions#bufferline#init(ext)
@@ -11,7 +15,7 @@ function! airline#extensions#bufferline#init(ext)
     let g:bufferline_active_highlight = 'bufferline_selected'
     let g:bufferline_active_buffer_left = ''
     let g:bufferline_active_buffer_right = ''
-    let g:bufferline_separator = ' '
+    let g:bufferline_separator = g:airline_symbols.space
   endif
 
   call airline#parts#define_raw('file', '%{bufferline#refresh_status()}'.bufferline#get_status_string())

autoload/airline/extensions/capslock.vim

@@ -0,0 +1,14 @@
+" MIT License. Copyright (c) 2014 Mathias Andersson.
+" vim: et ts=2 sts=2 sw=2
+if !exists('*CapsLockStatusline')
+  finish
+endif
+
+function! airline#extensions#capslock#status()
+  return CapsLockStatusline() == '[caps]' ? 'CAPS' : ''
+endfunction
+
+function! airline#extensions#capslock#init(ext)
+  call airline#parts#define_function('capslock', 'airline#extensions#capslock#status')
+endfunction
+

autoload/airline/extensions/commandt.vim

@@ -1,6 +1,10 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+if !get(g:, 'command_t_loaded', 0)
+  finish
+endif
+
 function! airline#extensions#commandt#apply(...)
   if bufname('%') ==# 'GoToFile'
     call airline#extensions#apply_left_override('CommandT', '')

autoload/airline/extensions/csv.vim

@@ -1,6 +1,10 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+if !get(g:, 'loaded_csv', 0) && !exists(':Table')
+  finish
+endif
+
 let s:column_display = get(g:, 'airline#extensions#csv#column_display', 'Number')
 
 function! airline#extensions#csv#get_column()

autoload/airline/extensions/ctrlp.vim

@@ -1,6 +1,10 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+
 let s:color_template = get(g:, 'airline#extensions#ctrlp#color_template', 'insert')
 
 function! airline#extensions#ctrlp#generate_color_map(dark, light, white)
@@ -29,17 +33,28 @@ function! airline#extensions#ctrlp#load_theme(palette)
   endfor
 endfunction
 
-" Arguments: focus, byfname, s:regexp, prv, item, nxt, marked
+" Arguments: focus, byfname, regexp, prv, item, nxt, marked
 function! airline#extensions#ctrlp#ctrlp_airline(...)
-  let regex = a:3 ? '%#CtrlPlight#  regex %*' : ''
-  let prv = '%#CtrlPlight# '.a:4.' %#Ctrlparrow1#'.g:airline_left_sep
-  let item = '%#CtrlPwhite# '.a:5.' %#CtrlParrow2#'.g:airline_left_sep
-  let nxt = '%#CtrlPlight# '.a:6.' %#CtrlParrow3#'.g:airline_left_sep
-  let marked = '%#CtrlPdark# '.a:7.' '
-  let focus = '%=%<%#CtrlPdark# '.a:1.' %*'
-  let byfname = '%#CtrlParrow3#'.g:airline_right_alt_sep.'%#CtrlPdark# '.a:2.' %*'
-  let dir = '%#CtrlParrow3#'.g:airline_right_sep.'%#CtrlPlight# '.getcwd().' %*'
-  return regex.prv.item.nxt.marked.focus.byfname.dir
+  let b = airline#builder#new({'active': 1})
+  if a:2 == 'file'
+    call b.add_section_spaced('CtrlPlight', 'by fname')
+  endif
+  if a:3
+    call b.add_section_spaced('CtrlPlight', 'regex')
+  endif
+  if get(g:, 'airline#extensions#ctrlp#show_adjacent_modes', 1)
+    call b.add_section_spaced('CtrlPlight', a:4)
+    call b.add_section_spaced('CtrlPwhite', a:5)
+    call b.add_section_spaced('CtrlPlight', a:6)
+  else
+    call b.add_section_spaced('CtrlPwhite', a:5)
+  endif
+  call b.add_section_spaced('CtrlPdark', a:7)
+  call b.split()
+  call b.add_section_spaced('CtrlPdark', a:1)
+  call b.add_section_spaced('CtrlPdark', a:2)
+  call b.add_section_spaced('CtrlPlight', '%{getcwd()}')
+  return b.build()
 endfunction
 
 " Argument: len
@@ -51,7 +66,7 @@ endfunction
 
 function! airline#extensions#ctrlp#apply(...)
   " disable statusline overwrite if ctrlp already did it
-  return match(&statusline, 'CtrlPlight') >= 0 ? -1 : 0
+  return match(&statusline, 'CtrlPwhite') >= 0 ? -1 : 0
 endfunction
 
 function! airline#extensions#ctrlp#init(ext)

autoload/airline/extensions/default.vim

@@ -1,8 +1,8 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 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,
+      \ 'b': 79,
       \ 'x': 60,
       \ 'y': 88,
       \ 'z': 45,
@@ -18,8 +18,9 @@ function! s:get_section(winnr, key, ...)
       return ''
     endif
   endif
+  let spc = g:airline_symbols.space
   let text = airline#util#getwinvar(a:winnr, 'airline_section_'.a:key, g:airline_section_{a:key})
-  let [prefix, suffix] = [get(a:000, 0, '%( '), get(a:000, 1, ' %)')]
+  let [prefix, suffix] = [get(a:000, 0, '%('.spc), get(a:000, 1, spc.'%)')]
   return empty(text) ? '' : prefix.text.suffix
 endfunction
 
@@ -28,33 +29,51 @@ function! s:build_sections(builder, context, 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
+    call s:add_section(a:builder, a:context, key)
   endfor
 endfunction
 
+if v:version >= 704 || (v:version >= 703 && has('patch81'))
+  function s:add_section(builder, context, key)
+    " i have no idea why the warning section needs special treatment, but it's
+    " needed to prevent separators from showing up
+    if a:key == 'warning'
+      call a:builder.add_raw('%(')
+    endif
+    call a:builder.add_section('airline_'.a:key, s:get_section(a:context.winnr, a:key))
+    if a:key == 'warning'
+      call a:builder.add_raw('%)')
+    endif
+  endfunction
+else
+  " older version don't like the use of %(%)
+  function s:add_section(builder, context, key)
+    if a:key == 'warning'
+      call a:builder.add_raw('%#airline_warning#'.s:get_section(a:context.winnr, a:key))
+    else
+      call a:builder.add_section('airline_'.a:key, s:get_section(a:context.winnr, a:key))
+    endif
+  endfunction
+endif
+
 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])
+    call s:build_sections(a:builder, a:context, s:layout[0])
   else
-    call a:builder.add_section('airline_c'.(a:context.bufnr), ' %f%m ')
+    let text = s:get_section(winnr, 'c')
+    if empty(text)
+      let text = ' %f%m '
+    endif
+    call a:builder.add_section('airline_c'.(a:context.bufnr), text)
   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])
+    call s:build_sections(a:builder, a:context, s:layout[1])
   endif
 
   return 1

autoload/airline/extensions/eclim.vim

@@ -0,0 +1,53 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':ProjectCreate')
+  finish
+endif
+
+function! airline#extensions#eclim#creat_line(...)
+  if &filetype == "tree"
+    let builder = a:1
+    call builder.add_section('airline_a', ' Project ')
+    call builder.add_section('airline_b', ' %f ')
+    call builder.add_section('airline_c', '')
+  return 1
+  endif
+endfunction
+
+function! airline#extensions#eclim#get_warnings()
+  let eclimList = eclim#display#signs#GetExisting()
+
+  if !empty(eclimList)
+    " Remove any non-eclim signs (see eclim#display#signs#Update)
+    " First check for just errors since they are more important.
+    " If there are no errors, then check for warnings.
+    let errorList = filter(copy(eclimList), 'v:val.name =~ "^\\(qf_\\)\\?\\(error\\)$"')
+
+    if (empty(errorList))
+      " use the warnings
+      call filter(eclimList, 'v:val.name =~ "^\\(qf_\\)\\?\\(warning\\)$"')
+      let type = 'W'
+    else
+      " Use the errors
+      let eclimList = errorList
+      let type = 'E'
+    endif
+
+    if !empty(eclimList)
+      let errorsLine = eclimList[0]['line']
+      let errorsNumber = len(eclimList)
+      let errors = "[Eclim:" . type . " line:".string(errorsLine)." (".string(errorsNumber).")]"
+      if !exists(':SyntasticCheck') || SyntasticStatuslineFlag() == ''
+        return errors.(g:airline_symbols.space)
+      endif
+    endif
+  endif
+  return ''
+endfunction
+
+function! airline#extensions#eclim#init(ext)
+  call airline#parts#define_function('eclim', 'airline#extensions#eclim#get_warnings')
+  call a:ext.add_statusline_func('airline#extensions#eclim#creat_line')
+endfunction
+

autoload/airline/extensions/example.vim

@@ -1,6 +1,13 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+" we don't actually want this loaded :P
+finish
+
+" Due to some potential rendering issues, the use of the `space` variable is
+" recommended.
+let s:spc = g:airline_symbols.space
+
 " Extension specific variables can be defined the usual fashion.
 if !exists('g:airline#extensions#example#number_of_cats')
   let g:airline#extensions#example#number_of_cats = 42
@@ -32,7 +39,7 @@ function! airline#extensions#example#apply(...)
     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()}'
+    let w:airline_section_c .= s:spc.g:airline_left_alt_sep.s:spc.'%{airline#extensions#example#get_cats()}'
   endif
 endfunction
 

autoload/airline/extensions/hunks.vim

@@ -1,6 +1,10 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+if !get(g:, 'loaded_signify', 0) && !get(g:, 'loaded_gitgutter', 0) && !get(g:, 'loaded_changes', 0)
+  finish
+endif
+
 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', ['+', '~', '-'])
 
@@ -12,13 +16,30 @@ function! s:get_hunks_signify()
   return []
 endfunction
 
+function! s:is_branch_empty()
+  return exists('*airline#extensions#branch#head') && empty(airline#extensions#branch#head())
+endfunction
+
 function! s:get_hunks_gitgutter()
-  if !get(g:, 'gitgutter_enabled', 0)
+  if !get(g:, 'gitgutter_enabled', 0) || s:is_branch_empty()
     return ''
   endif
   return GitGutterGetHunkSummary()
 endfunction
 
+function! s:get_hunks_changes()
+  if !get(b:, 'changes_view_enabled', 0) || s:is_branch_empty()
+    return []
+  endif
+  let hunks = changes#GetStats()
+  for i in hunks
+    if i > 0
+      return hunks
+    endif
+  endfor
+  return []
+endfunction
+
 function! s:get_hunks_empty()
   return ''
 endfunction
@@ -30,6 +51,8 @@ function! s:get_hunks()
       let s:source_func = 's:get_hunks_signify'
     elseif exists('*GitGutterGetHunkSummary')
       let s:source_func = 's:get_hunks_gitgutter'
+    elseif exists('*changes#GetStats')
+      let s:source_func = 's:get_hunks_changes'
     else
       let s:source_func = 's:get_hunks_empty'
     endif

autoload/airline/extensions/netrw.vim

@@ -0,0 +1,32 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':NetrwSettings')
+  finish
+endif
+
+function! airline#extensions#netrw#apply(...)
+  if &ft == 'netrw'
+    let spc = g:airline_symbols.space
+
+    call a:1.add_section('airline_a', spc.'netrw'.spc)
+    if exists('*airline#extensions#branch#get_head')
+      call a:1.add_section('airline_b', spc.'%{airline#extensions#branch#get_head()}'.spc)
+    endif
+    call a:1.add_section('airline_c', spc.'%f'.spc)
+    call a:1.split()
+    call a:1.add_section('airline_y', spc.'%{airline#extensions#netrw#sortstring()}'.spc)
+    return 1
+  endif
+endfunction
+
+function! airline#extensions#netrw#init(ext)
+  let g:netrw_force_overwrite_statusline = 0
+  call a:ext.add_statusline_func('airline#extensions#netrw#apply')
+endfunction
+
+
+function! airline#extensions#netrw#sortstring()
+  let order = (g:netrw_sort_direction =~ 'n') ? '+' : '-'
+  return g:netrw_sort_by . (g:airline_symbols.space) . '[' . order . ']'
+endfunction

autoload/airline/extensions/nrrwrgn.vim

@@ -0,0 +1,54 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !get(g:, 'loaded_nrrw_rgn', 0)
+  finish
+endif
+
+function! airline#extensions#nrrwrgn#apply(...)
+  if exists(":WidenRegion") == 2
+    let spc = g:airline_symbols.space
+    if !exists("*nrrwrgn#NrrwRgnStatus()") || empty(nrrwrgn#NrrwRgnStatus())
+      call a:1.add_section('airline_a', printf('%s[Narrowed%s#%d]', spc, spc, b:nrrw_instn))
+      let bufname=(get(b:, 'orig_buf', 0) ? bufname(b:orig_buf) : substitute(bufname('%'), '^Nrrwrgn_\zs.*\ze_\d\+$', submatch(0), ''))
+      call a:1.add_section('airline_c', spc.bufname.spc)
+      call a:1.split()
+    else
+      let dict=nrrwrgn#NrrwRgnStatus()
+      let vmode = { 'v': 'Char ', 'V': 'Line ', '': 'Block '}
+      let mode = dict.visual ? vmode[dict.visual] : vmode['V']
+      let winwidth = winwidth(0)
+      if winwidth < 80
+        let mode = mode[0]
+      endif
+      let title = (winwidth < 80 ? "Nrrw" : "Narrowed ")
+      let multi = (winwidth < 80 ? 'M' : 'Multi')
+      call a:1.add_section('airline_a', printf('[%s%s%s#%d]%s', (dict.multi ? multi : ""),
+        \ title, mode, b:nrrw_instn, spc))
+      let name = dict.fullname
+      if name !=# '[No Name]'
+        if winwidth > 100
+          " need some space
+          let name = fnamemodify(dict.fullname, ':~')
+          if strlen(name) > 8
+            " shorten name
+            let name = substitute(name, '\(.\)[^/\\]*\([/\\]\)', '\1\2', 'g')
+          endif
+        else
+          let name = fnamemodify(dict.fullname, ':t')
+        endif
+      endif
+      let range=(dict.multi ? '' : printf("[%d-%d]", dict.start[1], dict.end[1]))
+      call a:1.add_section('airline_c', printf("%s %s %s", name, range, dict.enabled ? "\u2713" : '!'))
+      call a:1.split()
+      call a:1.add_section('airline_x', get(g:, 'airline_section_x').spc)
+      call a:1.add_section('airline_y', spc.get(g:, 'airline_section_y').spc)
+      call a:1.add_section('airline_z', spc.get(g:, 'airline_section_z'))
+    endif
+    return 1
+  endif
+endfunction
+
+function! airline#extensions#nrrwrgn#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#nrrwrgn#apply')
+endfunction

autoload/airline/extensions/promptline.vim

@@ -0,0 +1,33 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':PromptlineSnapshot')
+  finish
+endif
+
+if !exists('airline#extensions#promptline#snapshot_file') || !len('airline#extensions#promptline#snapshot_file')
+  finish
+endif
+
+let s:prompt_snapshot_file = get(g:, 'airline#extensions#promptline#snapshot_file', '')
+let s:color_template = get(g:, 'airline#extensions#promptline#color_template', 'normal')
+
+function! airline#extensions#promptline#init(ext)
+  call a:ext.add_theme_func('airline#extensions#promptline#set_prompt_colors')
+endfunction
+
+function! airline#extensions#promptline#set_prompt_colors(palette)
+  let color_template = has_key(a:palette, s:color_template) ? s:color_template : 'normal'
+  let mode_palette = a:palette[color_template]
+
+  if !has_key(g:, 'promptline_symbols')
+    let g:promptline_symbols = {
+          \ 'left'           : g:airline_left_sep,
+          \ 'right'          : g:airline_right_sep,
+          \ 'left_alt'       : g:airline_left_alt_sep,
+          \ 'right_alt'      : g:airline_right_alt_sep}
+  endif
+
+  let promptline_theme = promptline#api#create_theme_from_airline(mode_palette)
+  call promptline#api#create_snapshot_with_theme(s:prompt_snapshot_file, promptline_theme)
+endfunction

autoload/airline/extensions/quickfix.vim

@@ -0,0 +1,37 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let g:airline#extensions#quickfix#quickfix_text = 'Quickfix'
+let g:airline#extensions#quickfix#location_text = 'Location'
+
+function! airline#extensions#quickfix#apply(...)
+  if &buftype == 'quickfix'
+    let w:airline_section_a = s:get_text()
+    let w:airline_section_b = '%{get(w:, "quickfix_title", "")}'
+    let w:airline_section_c = ''
+    let w:airline_section_x = ''
+  endif
+endfunction
+
+function! airline#extensions#quickfix#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#quickfix#apply')
+endfunction
+
+function! s:get_text()
+  redir => buffers
+  silent ls
+  redir END
+
+  let nr = bufnr('%')
+  for buf in split(buffers, '\n')
+    if match(buf, '\v^\s*'.nr) > -1
+      if match(buf, '\cQuickfix') > -1
+        return g:airline#extensions#quickfix#quickfix_text
+      else
+        return g:airline#extensions#quickfix#location_text
+      endif
+    endif
+  endfor
+  return ''
+endfunction
+

autoload/airline/extensions/syntastic.vim

@@ -1,10 +1,14 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+if !exists(':SyntasticCheck')
+  finish
+endif
+
 function! airline#extensions#syntastic#get_warnings()
   let errors = SyntasticStatuslineFlag()
   if strlen(errors) > 0
-    return errors.' '
+    return errors.(g:airline_symbols.space)
   endif
   return ''
 endfunction

autoload/airline/extensions/tabline.vim

@@ -1,41 +1,36 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 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)
+let s:show_tabs = get(g:, 'airline#extensions#tabline#show_tabs', 1)
 
 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
+  autocmd User AirlineToggledOn call s:toggle_on()
+  autocmd User AirlineToggledOff call s:toggle_off()
 
+  call s:toggle_on()
   call a:ext.add_theme_func('airline#extensions#tabline#load_theme')
 endfunction
 
+function! s:toggle_off()
+  call airline#extensions#tabline#autoshow#off()
+  call airline#extensions#tabline#tabs#off()
+  call airline#extensions#tabline#buffers#off()
+endfunction
+
+function! s:toggle_on()
+  call airline#extensions#tabline#autoshow#on()
+  call airline#extensions#tabline#tabs#on()
+  call airline#extensions#tabline#buffers#on()
+
+  set tabline=%!airline#extensions#tabline#get()
+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)
@@ -43,33 +38,36 @@ function! airline#extensions#tabline#load_theme(palette)
   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)
+  if has_key(a:palette, 'normal_modified') && has_key(a:palette.normal_modified, 'airline_c')
+    let l:tabmodu = get(colors, 'airline_tabmod_unsel', a:palette.normal_modified.airline_c)
+  else
+    "Fall back to normal airline_c if modified airline_c isn't present
+    let l:tabmodu = get(colors, 'airline_tabmod_unsel', a:palette.normal.airline_c)
+  endif
+
   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_tabmod_unsel', l:tabmodu)
   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
-
+let s:current_tabcnt = -1
 function! airline#extensions#tabline#get()
-  if s:show_buffers && tabpagenr('$') == 1
-    return s:get_buffers()
+  let curtabcnt = tabpagenr('$')
+  if curtabcnt != s:current_tabcnt
+    let s:current_tabcnt = curtabcnt
+    call airline#extensions#tabline#tabs#invalidate()
+    call airline#extensions#tabline#buffers#invalidate()
+  endif
+
+  if s:show_buffers && curtabcnt == 1 || !s:show_tabs
+    return airline#extensions#tabline#buffers#get()
   else
-    return s:get_tabs()
+    return airline#extensions#tabline#tabs#get()
   endif
 endfunction
 
@@ -80,91 +78,22 @@ function! airline#extensions#tabline#title(n)
 endfunction
 
 function! airline#extensions#tabline#get_buffer_name(nr)
-  return airline#extensions#tabline#formatters#{s:formatter}(a:nr, get(s:, 'current_buffer_list', []))
+  return airline#extensions#tabline#formatters#{s:formatter}#format(a:nr, airline#extensions#tabline#buflist#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]
+function! airline#extensions#tabline#new_builder()
+  let builder_context = {
+        \ 'active'        : 1,
+        \ '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),
+        \ }
+  if get(g:, 'airline_powerline_fonts', 0)
+    let builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , g:airline_left_sep)
+    let builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , g:airline_left_alt_sep)
+  else
+    let builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , ' ')
+    let builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , '|')
   endif
 
-  let s:current_buffer_list = buffers
-  return buffers
+  return airline#builder#new(builder_context)
 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/autoshow.vim

@@ -0,0 +1,51 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
+let s:buf_min_count = get(g:, 'airline#extensions#tabline#buffer_min_count', 0)
+let s:tab_min_count = get(g:, 'airline#extensions#tabline#tab_min_count', 0)
+
+function! airline#extensions#tabline#autoshow#off()
+  if exists('s:original_tabline')
+    let &tabline = s:original_tabline
+    let &showtabline = s:original_showtabline
+  endif
+
+  augroup airline_tabline_autoshow
+    autocmd!
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#autoshow#on()
+  let [ s:original_tabline, s:original_showtabline ] = [ &tabline, &showtabline ]
+
+  augroup airline_tabline_autoshow
+    autocmd!
+    if s:buf_min_count <= 0 && s:tab_min_count <= 1
+      set showtabline=2
+    else
+      if s:show_buffers == 1
+        autocmd BufEnter  * call <sid>show_tabline(s:buf_min_count, len(airline#extensions#tabline#buflist#list()))
+        autocmd BufUnload * call <sid>show_tabline(s:buf_min_count, len(airline#extensions#tabline#buflist#list()) - 1)
+      else
+        autocmd TabEnter  * call <sid>show_tabline(s:tab_min_count, tabpagenr('$'))
+      endif
+    endif
+
+    " Invalidate cache.  This has to come after the BufUnload for
+    " s:show_buffers, to invalidate the cache for BufEnter.
+    autocmd BufAdd,BufUnload * call airline#extensions#tabline#buflist#invalidate()
+  augroup END
+endfunction
+
+function! s:show_tabline(min_count, total_count)
+  if a:total_count >= a:min_count
+    if &showtabline != 2
+      set showtabline=2
+    endif
+  else
+    if &showtabline != 0
+      set showtabline=0
+    endif
+  endif
+endfunction

autoload/airline/extensions/tabline/buffers.vim

@@ -0,0 +1,186 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:buffer_idx_mode = get(g:, 'airline#extensions#tabline#buffer_idx_mode', 0)
+let s:spc = g:airline_symbols.space
+
+let s:current_bufnr = -1
+let s:current_modified = 0
+let s:current_tabline = ''
+let s:current_visible_buffers = []
+
+let s:number_map = &encoding == 'utf-8'
+      \ ? {
+      \ '0': '⁰',
+      \ '1': '¹',
+      \ '2': '²',
+      \ '3': '³',
+      \ '4': '⁴',
+      \ '5': '⁵',
+      \ '6': '⁶',
+      \ '7': '⁷',
+      \ '8': '⁸',
+      \ '9': '⁹'
+      \ }
+      \ : {}
+
+function! airline#extensions#tabline#buffers#off()
+  augroup airline_tabline_buffers
+    autocmd!
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#buffers#on()
+  augroup airline_tabline_buffers
+    autocmd!
+    autocmd BufDelete * call airline#extensions#tabline#buffers#invalidate()
+  augroup END
+
+  if s:buffer_idx_mode
+    call s:define_buffer_idx_mode_mappings()
+  endif
+endfunction
+
+function! airline#extensions#tabline#buffers#invalidate()
+  let s:current_bufnr = -1
+endfunction
+
+function! airline#extensions#tabline#buffers#get()
+  let cur = bufnr('%')
+  if cur == s:current_bufnr
+    if !g:airline_detect_modified || getbufvar(cur, '&modified') == s:current_modified
+      return s:current_tabline
+    endif
+  endif
+
+  let l:index = 1
+  let b = airline#extensions#tabline#new_builder()
+  let tab_bufs = tabpagebuflist(tabpagenr())
+  for nr in s:get_visible_buffers()
+    if nr < 0
+      call b.add_raw('%#airline_tabhid#...')
+      continue
+    endif
+
+    if cur == nr
+      if g:airline_detect_modified && getbufvar(nr, '&modified')
+        let group = 'airline_tabmod'
+      else
+        let group = 'airline_tabsel'
+      endif
+      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
+    else
+      if g:airline_detect_modified && getbufvar(nr, '&modified')
+        let group = 'airline_tabmod_unsel'
+      elseif index(tab_bufs, nr) > -1
+        let group = 'airline_tab'
+      else
+        let group = 'airline_tabhid'
+      endif
+    endif
+
+    if s:buffer_idx_mode
+      if len(s:number_map) > 0
+        call b.add_section(group, s:spc . get(s:number_map, l:index, '') . '%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)' . s:spc)
+      else
+        call b.add_section(group, '['.l:index.s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.']')
+      endif
+      let l:index = l:index + 1
+    else
+      call b.add_section(group, s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.s:spc)
+    endif
+  endfor
+
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  call b.add_section('airline_tabfill', '')
+  call b.add_section('airline_tabtype', ' buffers ')
+
+  let s:current_bufnr = cur
+  let s:current_tabline = b.build()
+  return s:current_tabline
+endfunction
+
+function! s:get_visible_buffers()
+  let buffers = airline#extensions#tabline#buflist#list()
+  let cur = bufnr('%')
+
+  let total_width = 0
+  let max_width = 0
+
+  for nr in buffers
+    let width = len(airline#extensions#tabline#get_buffer_name(nr)) + 4
+    let total_width += width
+    let max_width = max([max_width, width])
+  endfor
+
+  " only show current and surrounding buffers if there are too many buffers
+  let position  = index(buffers, cur)
+  let vimwidth = &columns
+  if total_width > vimwidth && position > -1
+    let buf_count = len(buffers)
+
+    " determine how many buffers to show based on the longest buffer width,
+    " use one on the right side and put the rest on the left
+    let buf_max   = vimwidth / max_width
+    let buf_right = 1
+    let buf_left  = max([0, buf_max - buf_right])
+
+    let start = max([0, position - buf_left])
+    let end   = min([buf_count, position + buf_right])
+
+    " fill up available space on the right
+    if position < buf_left
+      let end += (buf_left - position)
+    endif
+
+    " fill up available space on the left
+    if end > buf_count - 1 - buf_right
+      let start -= max([0, buf_right - (buf_count - 1 - position)])
+    endif
+
+    let buffers = eval('buffers[' . start . ':' . end . ']')
+
+    if start > 0
+      call insert(buffers, -1, 0)
+    endif
+
+    if end < buf_count - 1
+      call add(buffers, -1)
+    endif
+  endif
+
+  let s:current_visible_buffers = buffers
+  return buffers
+endfunction
+
+function! s:select_tab(buf_index)
+  " no-op when called in the NERDTree buffer
+  if exists('t:NERDTreeBufName') && bufname('%') == t:NERDTreeBufName
+    return
+  endif
+
+  let idx = a:buf_index
+  if s:current_visible_buffers[0] == -1
+    let idx = idx + 1
+  endif
+
+  let buf = get(s:current_visible_buffers, idx, 0)
+  if buf != 0
+    exec 'b!' . buf
+  endif
+endfunction
+
+function! s:define_buffer_idx_mode_mappings()
+  noremap! <unique> <Plug>AirlineSelectTab1 :call <SID>select_tab(0)<CR>
+  noremap! <unique> <Plug>AirlineSelectTab2 :call <SID>select_tab(1)<CR>
+  noremap! <unique> <Plug>AirlineSelectTab3 :call <SID>select_tab(2)<CR>
+  noremap! <unique> <Plug>AirlineSelectTab4 :call <SID>select_tab(3)<CR>
+  noremap! <unique> <Plug>AirlineSelectTab5 :call <SID>select_tab(4)<CR>
+  noremap! <unique> <Plug>AirlineSelectTab6 :call <SID>select_tab(5)<CR>
+  noremap! <unique> <Plug>AirlineSelectTab7 :call <SID>select_tab(6)<CR>
+  noremap! <unique> <Plug>AirlineSelectTab8 :call <SID>select_tab(7)<CR>
+  noremap! <unique> <Plug>AirlineSelectTab9 :call <SID>select_tab(8)<CR>
+endfunction

autoload/airline/extensions/tabline/buflist.vim

@@ -0,0 +1,46 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
+let s:buffers = {}
+
+for nr in range(1, bufnr('$'))
+  let s:buffers[nr] = 1
+endfor
+
+autocmd BufAdd * let s:buffers[expand('<abuf>')] = 1
+autocmd BufDelete * let nr = expand('<abuf>') | if has_key(s:buffers, nr) | unlet s:buffers[nr] | endif
+
+function! airline#extensions#tabline#buflist#invalidate()
+  unlet! s:current_buffer_list
+endfunction
+
+function! airline#extensions#tabline#buflist#list()
+  if exists('s:current_buffer_list')
+    return s:current_buffer_list
+  endif
+
+  let buffers = []
+  for key in keys(s:buffers)
+    let nr = str2nr(key)
+    if buflisted(nr) && bufexists(nr)
+      let toadd = 1
+      for ex in s:excludes
+        if match(bufname(nr), ex) >= 0
+          let toadd = 0
+          break
+        endif
+      endfor
+      if getbufvar(nr, 'current_syntax') == 'qf'
+        let toadd = 0
+      endif
+      if toadd
+        call add(buffers, nr)
+      endif
+    endif
+  endfor
+
+  let s:current_buffer_list = buffers
+  return buffers
+endfunction
+

autoload/airline/extensions/tabline/formatters/default.vim

@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:fmod = get(g:, 'airline#extensions#tabline#fnamemod', ':~:.')
@@ -7,13 +7,9 @@ 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)
+function! airline#extensions#tabline#formatters#default#format(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]'
@@ -25,10 +21,15 @@ function! airline#extensions#tabline#formatters#default(bufnr, buffers)
     endif
   endif
 
+  return airline#extensions#tabline#formatters#default#wrap_name(a:bufnr, _)
+endfunction
+
+function! airline#extensions#tabline#formatters#default#wrap_name(bufnr, buffer_name)
+  let _ = s:buf_nr_show ? printf(s:buf_nr_format, a:bufnr) : ''
+  let _ .= substitute(a:buffer_name, '\\', '/', 'g')
+
   if getbufvar(a:bufnr, '&modified') == 1
     let _ .= s:buf_modified_symbol
   endif
-
   return _
 endfunction
-

autoload/airline/extensions/tabline/formatters/unique_tail.vim

@@ -0,0 +1,27 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+function! airline#extensions#tabline#formatters#unique_tail#format(bufnr, buffers)
+  let duplicates = {}
+  let tails = {}
+  let map = {}
+  for nr in a:buffers
+    let name = bufname(nr)
+    if empty(name)
+      let map[nr] = '[No Name]'
+    else
+      let tail = fnamemodify(name, ':t')
+      if has_key(tails, tail)
+        let duplicates[nr] = nr
+      endif
+      let tails[tail] = 1
+      let map[nr] = airline#extensions#tabline#formatters#default#wrap_name(nr, tail)
+    endif
+  endfor
+
+  for nr in values(duplicates)
+    let map[nr] = airline#extensions#tabline#formatters#default#wrap_name(nr, fnamemodify(bufname(nr), ':p:.'))
+  endfor
+
+  return map[a:bufnr]
+endfunction

autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim

@@ -0,0 +1,91 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:skip_symbol = '…'
+
+function! airline#extensions#tabline#formatters#unique_tail_improved#format(bufnr, buffers)
+  if len(a:buffers) <= 1 " don't need to compare bufnames if has less than one buffer opened
+    return airline#extensions#tabline#formatters#default#format(a:bufnr, a:buffers)
+  endif
+
+  let curbuf_tail = fnamemodify(bufname(a:bufnr), ':t')
+  let do_deduplicate = 0
+  let path_tokens = {}
+
+  for nr in a:buffers
+    let name = bufname(nr)
+    if !empty(name) && nr != a:bufnr && fnamemodify(name, ':t') == curbuf_tail " only perform actions if curbuf_tail isn't unique
+      let do_deduplicate = 1
+      let tokens = reverse(split(substitute(fnamemodify(name, ':p:h'), '\\', '/', 'g'), '/'))
+      let token_index = 0
+      for token in tokens
+        if token == '' | continue | endif
+        if token == '.' | break | endif
+        if !has_key(path_tokens, token_index)
+          let path_tokens[token_index] = {}
+        endif
+        let path_tokens[token_index][token] = 1
+        let token_index += 1
+      endfor
+    endif
+  endfor
+
+  if do_deduplicate == 1
+    let path = []
+    let token_index = 0
+    for token in reverse(split(substitute(fnamemodify(bufname(a:bufnr), ':p:h'), '\\', '/', 'g'), '/'))
+      if token == '.' | break | endif
+      let duplicated = 0
+      let uniq = 1
+      let single = 1
+      if has_key(path_tokens, token_index)
+        let duplicated = 1
+        if len(keys(path_tokens[token_index])) > 1 | let single = 0 | endif
+        if has_key(path_tokens[token_index], token) | let uniq = 0 | endif
+      endif
+      call insert(path, {'token': token, 'duplicated': duplicated, 'uniq': uniq, 'single': single})
+      let token_index += 1
+    endfor
+
+    let buf_name = [curbuf_tail]
+    let has_uniq = 0
+    let has_skipped = 0
+    for token1 in reverse(path)
+      if !token1['duplicated'] && len(buf_name) > 1
+        call insert(buf_name, s:skip_symbol)
+        let has_skipped = 0
+        break
+      endif
+
+      if has_uniq == 1
+        call insert(buf_name, s:skip_symbol)
+        let has_skipped = 0
+        break
+      endif
+
+      if token1['uniq'] == 0 && token1['single'] == 1
+        let has_skipped = 1
+      else
+        if has_skipped == 1
+          call insert(buf_name, s:skip_symbol)
+          let has_skipped = 0
+        endif
+        call insert(buf_name, token1['token'])
+      endif
+
+      if token1['uniq'] == 1
+        let has_uniq = 1
+      endif
+    endfor
+
+    if has_skipped == 1
+      call insert(buf_name, s:skip_symbol)
+    endif
+
+    return airline#extensions#tabline#formatters#default#wrap_name(a:bufnr, join(buf_name, '/'))
+  else
+    return airline#extensions#tabline#formatters#default#format(a:bufnr, a:buffers)
+  endif
+endfunction

autoload/airline/extensions/tabline/tabs.vim

@@ -0,0 +1,80 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:show_tab_nr = get(g:, 'airline#extensions#tabline#show_tab_nr', 1)
+let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
+let s:show_close_button = get(g:, 'airline#extensions#tabline#show_close_button', 1)
+let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1)
+let s:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X')
+
+let s:current_bufnr = -1
+let s:current_tabnr = -1
+let s:current_modified = 0
+
+function! airline#extensions#tabline#tabs#off()
+  augroup airline_tabline_tabs
+    autocmd!
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#tabs#on()
+  augroup airline_tabline_tabs
+    autocmd!
+    autocmd BufDelete * call airline#extensions#tabline#tabs#invalidate()
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#tabs#invalidate()
+  let s:current_bufnr = -1
+endfunction
+
+function! airline#extensions#tabline#tabs#get()
+  let curbuf = bufnr('%')
+  let curtab = tabpagenr()
+  if curbuf == s:current_bufnr && curtab == s:current_tabnr
+    if !g:airline_detect_modified || getbufvar(curbuf, '&modified') == s:current_modified
+      return s:current_tabline
+    endif
+  endif
+
+  let b = airline#extensions#tabline#new_builder()
+  for i in range(1, tabpagenr('$'))
+    if i == curtab
+      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
+      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
+    else
+      let group = 'airline_tab'
+    endif
+    let val = '%('
+    if s:show_tab_nr
+      if s:tab_nr_type == 0
+        let val .= ' %{len(tabpagebuflist('.i.'))}'
+      else
+        let val .= (g:airline_symbols.space).i
+      endif
+    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()
+  if s:show_close_button
+    call b.add_section('airline_tab', ' %999X'.s:close_symbol.' ')
+  endif
+  if s:show_tab_type
+    call b.add_section('airline_tabtype', ' tabs ')
+  endif
+
+  let s:current_bufnr = curbuf
+  let s:current_tabnr = curtab
+  let s:current_tabline = b.build()
+  return s:current_tabline
+endfunction

autoload/airline/extensions/tagbar.vim

@@ -1,14 +1,19 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+if !exists(':TagbarToggle')
+  finish
+endif
+
 let s:flags = get(g:, 'airline#extensions#tagbar#flags', '')
+let s:spc = g:airline_symbols.space
 
 " Arguments: current, sort, fname
 function! airline#extensions#tagbar#get_status(...)
   let builder = airline#builder#new({ 'active': a:1 })
-  call builder.add_section('airline_a', ' Tagbar ')
-  call builder.add_section('airline_b', ' '.a:2.' ')
-  call builder.add_section('airline_c', ' '.a:3.' ')
+  call builder.add_section('airline_a', s:spc.'Tagbar'.s:spc)
+  call builder.add_section('airline_b', s:spc.a:2.s:spc)
+  call builder.add_section('airline_c', s:spc.a:3.s:spc)
   return builder.build()
 endfunction
 
@@ -18,9 +23,15 @@ function! airline#extensions#tagbar#inactive_apply(...)
   endif
 endfunction
 
+let s:airline_tagbar_last_lookup_time = 0
+let s:airline_tagbar_last_lookup_val = ''
 function! airline#extensions#tagbar#currenttag()
   if get(w:, 'airline_active', 0)
-    return tagbar#currenttag('%s', '', s:flags)
+    if s:airline_tagbar_last_lookup_time != localtime()
+      let s:airline_tagbar_last_lookup_val = tagbar#currenttag('%s', '', s:flags)
+      let s:airline_tagbar_last_lookup_time = localtime()
+    endif
+    return s:airline_tagbar_last_lookup_val
   endif
   return ''
 endfunction

autoload/airline/extensions/tmuxline.vim

@@ -0,0 +1,26 @@
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':Tmuxline')
+  finish
+endif
+
+let s:tmuxline_snapshot_file = get(g:, 'airline#extensions#tmuxline#snapshot_file', '')
+let s:color_template = get(g:, 'airline#extensions#tmuxline#color_template', 'normal')
+
+function! airline#extensions#tmuxline#init(ext)
+  call a:ext.add_theme_func('airline#extensions#tmuxline#set_tmux_colors')
+endfunction
+
+function! airline#extensions#tmuxline#set_tmux_colors(palette)
+  let color_template = has_key(a:palette, s:color_template) ? s:color_template : 'normal'
+  let mode_palette = a:palette[color_template]
+
+  let tmuxline_theme = tmuxline#api#create_theme_from_airline(mode_palette)
+  call tmuxline#api#set_theme(tmuxline_theme)
+
+  if strlen(s:tmuxline_snapshot_file)
+    call tmuxline#api#snapshot(s:tmuxline_snapshot_file)
+  endif
+endfunction
+

autoload/airline/extensions/undotree.vim

@@ -1,6 +1,10 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+if !exists(':UndotreeToggle')
+  finish
+endif
+
 function! airline#extensions#undotree#apply(...)
   if exists('t:undotree')
     if &ft == 'undotree'

autoload/airline/extensions/unite.vim

@@ -1,6 +1,10 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+if !get(g:, 'loaded_unite', 0)
+  finish
+endif
+
 function! airline#extensions#unite#apply(...)
   if &ft == 'unite'
     call a:1.add_section('airline_a', ' Unite ')

autoload/airline/extensions/virtualenv.vim

@@ -1,13 +1,25 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+if !isdirectory($VIRTUAL_ENV)
+  finish
+endif
+
+let s:spc = g:airline_symbols.space
+
 function! airline#extensions#virtualenv#init(ext)
   call a:ext.add_statusline_func('airline#extensions#virtualenv#apply')
 endfunction
 
 function! airline#extensions#virtualenv#apply(...)
   if &filetype =~ "python"
-    call airline#extensions#append_to_section('x', ' '.g:airline_right_alt_sep.' %{virtualenv#statusline()}')
+    if get(g:, 'virtualenv_loaded', 0)
+      let statusline = virtualenv#statusline()
+    else
+      let statusline = fnamemodify($VIRTUAL_ENV, ':t')
+    endif
+    call airline#extensions#append_to_section('x',
+          \ s:spc.g:airline_right_alt_sep.s:spc.statusline)
   endif
 endfunction
 

autoload/airline/extensions/whitespace.vim

@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 " http://got-ravings.blogspot.com/2008/10/vim-pr0n-statusline-whitespace-flags.html
@@ -11,57 +11,83 @@ else
 endif
 
 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:default_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:indent_algo = get(g:, 'airline#extensions#whitespace#mixed_indent_algo', 0)
 
-let s:enabled = 1
+let s:max_lines = get(g:, 'airline#extensions#whitespace#max_lines', 20000)
+
+let s:enabled = get(g:, 'airline#extensions#whitespace#enabled', 1)
+
+function! s:check_mixed_indent()
+  if s:indent_algo == 1
+    " [<tab>]<space><tab>
+    " spaces before or between tabs are not allowed
+    let t_s_t = '(^\t* +\t\s*\S)'
+    " <tab>(<space> x count)
+    " count of spaces at the end of tabs should be less then tabstop value
+    let t_l_s = '(^\t+ {' . &ts . ',}' . '\S)'
+    return search('\v' . t_s_t . '|' . t_l_s, 'nw')
+  else
+    return search('\v(^\t+ +)|(^ +\t+)', 'nw')
+  endif
+endfunction
 
 function! airline#extensions#whitespace#check()
-  if &readonly || !s:enabled
+  if &readonly || !&modifiable || !s:enabled || line('$') > s:max_lines
     return ''
   endif
 
   if !exists('b:airline_whitespace_check')
     let b:airline_whitespace_check = ''
+    let checks = get(g:, 'airline#extensions#whitespace#checks', s:default_checks)
 
     let trailing = 0
-    if index(s:checks, 'trailing') > -1
-      let trailing = search(' $', 'nw')
+    if index(checks, 'trailing') > -1
+      let trailing = search('\s$', 'nw')
     endif
 
     let mixed = 0
-    if index(s:checks, 'indent') > -1
-      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
+    if index(checks, 'indent') > -1
+      let mixed = s:check_mixed_indent()
     endif
 
-    if trailing != 0 || mixed
-      let b:airline_whitespace_check = s:symbol.' '
+    if trailing != 0 || mixed != 0
+      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 .= (g:airline_symbols.space).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)
+        if mixed != 0
+          let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:mixed_indent_format, mixed)
         endif
       endif
     endif
   endif
   return b:airline_whitespace_check
-endfunction!
+endfunction
 
 function! airline#extensions#whitespace#toggle()
   if s:enabled
-    autocmd! airline_whitespace CursorHold,BufWritePost
+    augroup airline_whitespace
+      autocmd!
+    augroup END
     augroup! airline_whitespace
     let s:enabled = 0
   else
     call airline#extensions#whitespace#init()
     let s:enabled = 1
   endif
+
+  if exists("g:airline#extensions#whitespace#enabled")
+    let g:airline#extensions#whitespace#enabled = s:enabled
+    if s:enabled && match(g:airline_section_warning, '#whitespace#check') < 0
+      let g:airline_section_warning .= airline#section#create(['whitespace'])
+      call airline#update_statusline()
+    endif
+  endif
   echo 'Whitespace checking: '.(s:enabled ? 'Enabled' : 'Disabled')
 endfunction
 

autoload/airline/extensions/windowswap.vim

@@ -0,0 +1,23 @@
+" vim: et ts=2 sts=2 sw=2
+
+if !exists('g:loaded_windowswap')
+  finish
+endif
+
+let s:spc = g:airline_symbols.space
+
+if !exists('g:airline#extensions#windowswap#indicator_text')
+  let g:airline#extensions#windowswap#indicator_text = 'WS'
+endif
+
+function! airline#extensions#windowswap#init(ext)
+  call airline#parts#define_function('windowswap', 'airline#extensions#windowswap#get_status')
+endfunction
+
+function! airline#extensions#windowswap#get_status()
+  if WindowSwap#HasMarkedWindow() && WindowSwap#GetMarkedWindowNum() == winnr()
+    return g:airline#extensions#windowswap#indicator_text.s:spc
+  endif
+  return ''
+endfunction
+

autoload/airline/highlighter.vim

@@ -1,8 +1,9 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:is_win32term = (has('win32') || has('win64')) && !has('gui_running')
 let s:separators = {}
+let s:accents = {}
 
 function! s:gui2cui(rgb, fallback)
   if a:rgb == ''
@@ -15,13 +16,13 @@ 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 mode = has('gui_running') || (has("termtruecolor") && &guicolors == 1) ? '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')
+    if has('gui_running') || (has("termtruecolor") && &guicolors == 1)
       let color = a:what ==# 'fg' ? '#000000' : '#FFFFFF'
     else
       let color = a:what ==# 'fg' ? 0 : 1
@@ -33,7 +34,7 @@ endfunction
 function! s:get_array(fg, bg, opts)
   let fg = a:fg
   let bg = a:bg
-  return has('gui_running')
+  return has('gui_running') || (has("termtruecolor") && &guicolors == 1)
         \ ? [ fg, bg, '', '', join(a:opts, ',') ]
         \ : [ '', '', fg, bg, join(a:opts, ',') ]
 endfunction
@@ -41,7 +42,10 @@ 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')
+  let reverse = has('gui_running') || (has("termtruecolor") && &guicolors == 1)
+        \ ? synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'gui')
+        \ : synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'cterm')
+        \|| synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'term')
   return reverse ? s:get_array(bg, fg, a:000) : s:get_array(fg, bg, a:000)
 endfunction
 
@@ -94,6 +98,10 @@ function! airline#highlighter#add_separator(from, to, inverse)
   call <sid>exec_separator({}, a:from, a:to, a:inverse, '')
 endfunction
 
+function! airline#highlighter#add_accent(accent)
+  let s:accents[a:accent] = 1
+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')
@@ -109,6 +117,8 @@ function! airline#highlighter#highlight_modified_inactive(bufnr)
 endfunction
 
 function! airline#highlighter#highlight(modes)
+  let p = g:airline#themes#{g:airline_theme}#palette
+
   " draw the base mode, followed by any overrides
   let mapped = map(a:modes, 'v:val == a:modes[0] ? v:val : a:modes[0]."_".v:val')
   let suffix = a:modes[0] == 'inactive' ? '_inactive' : ''
@@ -116,7 +126,27 @@ function! airline#highlighter#highlight(modes)
     if exists('g:airline#themes#{g:airline_theme}#palette[mode]')
       let dict = g:airline#themes#{g:airline_theme}#palette[mode]
       for kvp in items(dict)
-        call airline#highlighter#exec(kvp[0].suffix, kvp[1])
+        let mode_colors = kvp[1]
+        call airline#highlighter#exec(kvp[0].suffix, mode_colors)
+
+        for accent in keys(s:accents)
+          if !has_key(p.accents, accent)
+            continue
+          endif
+          let colors = copy(mode_colors)
+          if p.accents[accent][0] != ''
+            let colors[0] = p.accents[accent][0]
+          endif
+          if p.accents[accent][2] != ''
+            let colors[2] = p.accents[accent][2]
+          endif
+          if len(colors) >= 5
+            let colors[4] = get(p.accents[accent], 4, '')
+          else
+            call add(colors, get(p.accents[accent], 4, ''))
+          endif
+          call airline#highlighter#exec(kvp[0].suffix.'_'.accent, colors)
+        endfor
       endfor
 
       " TODO: optimize this

autoload/airline/init.vim

@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 function! s:check_defined(variable, default)
@@ -9,12 +9,17 @@ endfunction
 
 let s:loaded = 0
 function! airline#init#bootstrap()
-  if s:loaded | return | endif | let s:loaded = 1
+  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)?"":"<")
+  let g:airline#init#bootstrapping = 1
+
+  call s:check_defined('g:airline_left_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b0":">")
+  call s:check_defined('g:airline_left_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b1":">")
+  call s:check_defined('g:airline_right_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b2":"<")
+  call s:check_defined('g:airline_right_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b3":"<")
   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)
@@ -51,38 +56,47 @@ function! airline#init#bootstrap()
   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) ? '' : ''),
+        \ 'readonly': get(g:, 'airline_readonly_symbol', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a2" : 'RO'),
+        \ 'whitespace': get(g:, 'airline_powerline_fonts', 0) ? "\u2739" : '!',
+        \ 'linenr': get(g:, 'airline_linecolumn_prefix', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a1" : ':' ),
+        \ 'branch': get(g:, 'airline_branch_prefix', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a0" : ''),
         \ 'modified': '+',
+        \ 'space': ' ',
         \ }, 'keep')
 
-  call airline#parts#define_function('mode', 'airline#parts#mode')
+  call airline#parts#define('mode', {
+        \ 'function': 'airline#parts#mode',
+        \ 'accent': 'bold',
+        \ })
   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',
+        \ 'accent': 'red',
         \ })
   call airline#parts#define_raw('file', '%f%m')
+  call airline#parts#define_raw('linenr', '%{g:airline_symbols.linenr}%#__accent_bold#%4l%#__restore__#')
   call airline#parts#define_function('ffenc', 'airline#parts#ffenc')
-  call airline#parts#define_empty(['hunks', 'branch', 'tagbar', 'syntastic', 'whitespace'])
+  call airline#parts#define_empty(['hunks', 'branch', 'tagbar', 'syntastic', 'eclim', 'whitespace','windowswap'])
+  call airline#parts#define_text('capslock', '')
+
+  unlet g:airline#init#bootstrapping
 endfunction
 
 function! airline#init#sections()
+  let spc = g:airline_symbols.space
   if !exists('g:airline_section_a')
-    let g:airline_section_a = airline#section#create_left(['mode', 'paste', 'iminsert'])
+    let g:airline_section_a = airline#section#create_left(['mode', 'paste', 'capslock', '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'])
+    let g:airline_section_c = airline#section#create(['%<', 'file', spc, 'readonly'])
   endif
   if !exists('g:airline_section_gutter')
-    let g:airline_section_gutter = airline#section#create([' ', 'readonly', '%='])
+    let g:airline_section_gutter = airline#section#create(['%='])
   endif
   if !exists('g:airline_section_x')
     let g:airline_section_x = airline#section#create_right(['tagbar', 'filetype'])
@@ -91,10 +105,10 @@ function! airline#init#sections()
     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 '])
+    let g:airline_section_z = airline#section#create(['windowswap', '%3p%%'.spc, 'linenr', ':%3v '])
   endif
   if !exists('g:airline_section_warning')
-    let g:airline_section_warning = airline#section#create(['syntastic', 'whitespace'])
+    let g:airline_section_warning = airline#section#create(['syntastic', 'eclim', 'whitespace'])
   endif
 endfunction
 

autoload/airline/parts.vim

@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 let s:parts = {}
@@ -7,7 +7,11 @@ let s:parts = {}
 
 function! airline#parts#define(key, config)
   let s:parts[a:key] = get(s:parts, a:key, {})
-  call extend(s:parts[a:key], a:config)
+  if exists('g:airline#init#bootstrapping')
+    call extend(s:parts[a:key], a:config, 'keep')
+  else
+    call extend(s:parts[a:key], a:config, 'force')
+  endif
 endfunction
 
 function! airline#parts#define_function(key, name)
@@ -30,6 +34,10 @@ function! airline#parts#define_condition(key, predicate)
   call airline#parts#define(a:key, { 'condition': a:predicate })
 endfunction
 
+function! airline#parts#define_accent(key, accent)
+  call airline#parts#define(a:key, { 'accent': a:accent })
+endfunction
+
 function! airline#parts#define_empty(keys)
   for key in a:keys
     call airline#parts#define_raw(key, '')

autoload/airline/section.vim

@@ -1,17 +1,22 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 call airline#init#bootstrap()
+let s:spc = g:airline_symbols.space
+
+function! s:wrap_accent(part, value)
+  if exists('a:part.accent')
+    call airline#highlighter#add_accent(a:part.accent)
+    return '%#__accent_'.(a:part.accent).'#'.a:value.'%#__restore__#'
+  endif
+  return a:value
+endfunction
 
 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).'()'
@@ -19,16 +24,16 @@ function! s:create(parts, append)
       let func = '"'.(part.text).'"'
     else
       if a:append > 0 && idx != 0
-        let val .= ' '.g:airline_left_alt_sep.' '
+        let val .= s:spc.g:airline_left_alt_sep.s:spc
       endif
       if a:append < 0 && idx != 0
-        let val = ' '.g:airline_right_alt_sep.' '.val
+        let val = s:spc.g:airline_right_alt_sep.s:spc.val
       endif
       if exists('part.raw')
-        let _ .= val.(part.raw)
+        let _ .= s:wrap_accent(part, val.(part.raw))
         continue
       else
-        let _ .= val.a:parts[idx]
+        let _ .= s:wrap_accent(part, val.a:parts[idx])
         continue
       endif
     endif
@@ -44,11 +49,11 @@ function! s:create(parts, append)
     endif
 
     if exists('part.condition')
-      let partval = substitute(partval, '{', '{'.(part.condition).' ? ', '')
+      let partval = substitute(partval, '{', '\="{".(part.condition)." ? "', '')
       let partval = substitute(partval, '}', ' : ""}', '')
     endif
 
-    let val .= partval
+    let val .= s:wrap_accent(part, partval)
     let _ .= val
   endfor
   return _

autoload/airline/themes.vim

@@ -1,18 +1,29 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
-" vim: ts=2 sts=2 sw=2 fdm=indent
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
 
 " generates a dictionary which defines the colors for each highlight group
-function! airline#themes#generate_color_map(section1, section2, section3, file)
-  "                       guifg           guibg           ctermfg         ctermbg         gui/term
-  return {
-      \ 'airline_a':    [ a:section1[0] , a:section1[1] , a:section1[2] , a:section1[3] , get(a:section1 , 4 , 'bold') ] ,
-      \ 'airline_b':    [ a:section2[0] , a:section2[1] , a:section2[2] , a:section2[3] , get(a:section2 , 4 , ''    ) ] ,
-      \ 'airline_c':    [ a:section3[0] , a:section3[1] , a:section3[2] , a:section3[3] , get(a:section3 , 4 , ''    ) ] ,
-      \ 'airline_file': [ a:file[0]     , a:file[1]     , a:file[2]     , a:file[3]     , get(a:file     , 4 , ''    ) ] ,
-      \ 'airline_x':    [ a:section3[0] , a:section3[1] , a:section3[2] , a:section3[3] , get(a:section3 , 4 , ''    ) ] ,
-      \ 'airline_y':    [ a:section2[0] , a:section2[1] , a:section2[2] , a:section2[3] , get(a:section2 , 4 , ''    ) ] ,
-      \ 'airline_z':    [ a:section1[0] , a:section1[1] , a:section1[2] , a:section1[3] , get(a:section1 , 4 , ''    ) ] ,
-      \ }
+function! airline#themes#generate_color_map(sect1, sect2, sect3, ...)
+  let palette = {
+        \ 'airline_a': [ a:sect1[0] , a:sect1[1] , a:sect1[2] , a:sect1[3] , get(a:sect1 , 4 , '') ] ,
+        \ 'airline_b': [ a:sect2[0] , a:sect2[1] , a:sect2[2] , a:sect2[3] , get(a:sect2 , 4 , '') ] ,
+        \ 'airline_c': [ a:sect3[0] , a:sect3[1] , a:sect3[2] , a:sect3[3] , get(a:sect3 , 4 , '') ] ,
+        \ }
+
+  if a:0 > 0
+    call extend(palette, {
+          \ 'airline_x': [ a:1[0] , a:1[1] , a:1[2] , a:1[3] , get(a:1 , 4 , '' ) ] ,
+          \ 'airline_y': [ a:2[0] , a:2[1] , a:2[2] , a:2[3] , get(a:2 , 4 , '' ) ] ,
+          \ 'airline_z': [ a:3[0] , a:3[1] , a:3[2] , a:3[3] , get(a:3 , 4 , '' ) ] ,
+          \ })
+  else
+    call extend(palette, {
+          \ 'airline_x': [ a:sect3[0] , a:sect3[1] , a:sect3[2] , a:sect3[3] , '' ] ,
+          \ 'airline_y': [ a:sect2[0] , a:sect2[1] , a:sect2[2] , a:sect2[3] , '' ] ,
+          \ 'airline_z': [ a:sect1[0] , a:sect1[1] , a:sect1[2] , a:sect1[3] , '' ] ,
+          \ })
+  endif
+
+  return palette
 endfunction
 
 function! airline#themes#get_highlight(group, ...)
@@ -30,25 +41,27 @@ function! airline#themes#patch(palette)
     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.
-  for mode in keys(a:palette)
-    let overrides = split(mode, '_')
-    let mode_colors = a:palette[overrides[0]]
-    if exists('mode_colors.airline_file')
-      let file_colors = mode_colors.airline_file
-      let file_colors[1] = mode_colors.airline_c[1]
-      let file_colors[3] = mode_colors.airline_c[3]
+  let a:palette.accents = get(a:palette, 'accents', {})
+  let a:palette.accents.bold = [ '', '', '', '', 'bold' ]
+  let a:palette.accents.italic = [ '', '', '', '', 'italic' ]
 
-      if len(overrides) > 1
-        let override_colors = a:palette[overrides[0].'_'.overrides[1]]
-        let override_colors.airline_file = copy(file_colors)
-        let override_status_colors = get(override_colors, 'airline_c', mode_colors.airline_c)
-        let override_colors.airline_file[1] = override_status_colors[1]
-        let override_colors.airline_file[3] = override_status_colors[3]
-      endif
-    endif
-  endfor
+  if !has_key(a:palette.accents, 'red')
+    let a:palette.accents.red = [ '#ff0000' , '' , 160 , '' ]
+  endif
+  if !has_key(a:palette.accents, 'green')
+    let a:palette.accents.green = [ '#008700' , '' , 22  , '' ]
+  endif
+  if !has_key(a:palette.accents, 'blue')
+    let a:palette.accents.blue = [ '#005fff' , '' , 27  , '' ]
+  endif
+  if !has_key(a:palette.accents, 'yellow')
+    let a:palette.accents.yellow = [ '#dfff00' , '' , 190 , '' ]
+  endif
+  if !has_key(a:palette.accents, 'orange')
+    let a:palette.accents.orange = [ '#df5f00' , '' , 166 , '' ]
+  endif
+  if !has_key(a:palette.accents, 'purple')
+    let a:palette.accents.purple = [ '#af00df' , '' , 128 , '' ]
+  endif
 endfunction
 

autoload/airline/themes/badwolf.vim

@@ -15,18 +15,21 @@ let s:V4 = [ '#c7915b' , 173 ]                   " coffee
 let s:PA = [ '#f4cf86' , 222 ]                   " dirtyblonde
 let s:RE = [ '#ff9eb8' , 211 ]                   " dress
 
-let s:file = [ '#ff2c4b' , ''      , 196     , ''      , '' ]
-let s:IA   = [ s:N2[1]   , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
+let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
 
 let g:airline#themes#badwolf#palette = {}
 
-let g:airline#themes#badwolf#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#badwolf#palette.accents = {
+      \ 'red': [ '#ff2c4b' , '' , 196 , '' , '' ]
+      \ }
+
+let g:airline#themes#badwolf#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 let g:airline#themes#badwolf#palette.normal_modified = {
       \ 'airline_b': [ s:N2[0]   , s:N4[0]   , s:N2[2]   , s:N4[1]   , ''     ] ,
       \ 'airline_c': [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
 
 
-let g:airline#themes#badwolf#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#badwolf#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 let g:airline#themes#badwolf#palette.insert_modified = {
       \ 'airline_c': [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
 let g:airline#themes#badwolf#palette.insert_paste = {
@@ -38,12 +41,12 @@ let g:airline#themes#badwolf#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s
 let g:airline#themes#badwolf#palette.replace_modified = g:airline#themes#badwolf#palette.insert_modified
 
 
-let g:airline#themes#badwolf#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#badwolf#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 let g:airline#themes#badwolf#palette.visual_modified = {
       \ 'airline_c': [ s:V3[0]   , s:V4[0]   , s:V3[2]   , s:V4[1]   , ''     ] }
 
 
-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 = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
 let g:airline#themes#badwolf#palette.inactive_modified = {
       \ 'airline_c': [ s:V1[1]   , ''        , s:V1[3]   , ''        , ''     ] }
 

autoload/airline/themes/base16.vim

@@ -1,4 +1,4 @@
-function! s:load_constant()
+if get(g:, 'airline#themes#base16#constant', 0)
   let g:airline#themes#base16#palette = {}
 
   " Color palette
@@ -23,13 +23,11 @@ function! s:load_constant()
   let s:gui_pink = '#d7afd7'
   let s:cterm_pink = 182
 
-  let s:file  = ['#ff0000', '', 160, '', '']
-
   " Normal mode
   let s:N1 = [s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green]
   let s:N2 = [s:gui_light_gray, s:gui_med_gray_lo, s:cterm_light_gray, s:cterm_med_gray_lo]
   let s:N3 = [s:gui_green, s:gui_med_gray_hi, s:cterm_green, s:cterm_med_gray_hi]
-  let g:airline#themes#base16#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+  let g:airline#themes#base16#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
   let g:airline#themes#base16#palette.normal_modified = {
         \ 'airline_c': [s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, ''],
         \ }
@@ -37,7 +35,7 @@ function! s:load_constant()
   " Insert mode
   let s:I1 = [s:gui_med_gray_hi, s:gui_blue, s:cterm_med_gray_hi, s:cterm_blue]
   let s:I3 = [s:gui_blue, s:gui_med_gray_hi, s:cterm_blue, s:cterm_med_gray_hi]
-  let g:airline#themes#base16#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3, s:file)
+  let g:airline#themes#base16#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3)
   let g:airline#themes#base16#palette.insert_modified = copy(g:airline#themes#base16#palette.normal_modified)
   let g:airline#themes#base16#palette.insert_paste = {
         \ 'airline_a': [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
@@ -53,63 +51,57 @@ function! s:load_constant()
   " Visual mode
   let s:V1 = [s:gui_dark_gray, s:gui_pink, s:cterm_dark_gray, s:cterm_pink]
   let s:V3 = [s:gui_pink, s:gui_med_gray_hi, s:cterm_pink, s:cterm_med_gray_hi]
-  let g:airline#themes#base16#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3, s:file)
+  let g:airline#themes#base16#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3)
   let g:airline#themes#base16#palette.visual_modified = copy(g:airline#themes#base16#palette.insert_modified)
 
   " 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 = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
   let g:airline#themes#base16#palette.inactive_modified = {
         \ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
         \ }
-endfunction
-
-function! s:load_dynamic()
-  let g:airline#themes#base16#palette = {}
-  let s:file = airline#themes#get_highlight('Constant')
-
-  let s:N1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['DiffText', 'fg'], 'bold')
-  let s:N2 = airline#themes#get_highlight('Visual')
-  let s:N3 = airline#themes#get_highlight('CursorLine')
-  let g:airline#themes#base16#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
-
-  let group = airline#themes#get_highlight('vimCommand')
-  let g:airline#themes#base16#palette.normal_modified = {
-        \ 'statusline': [ group[0], '', group[2], '', '' ]
-        \ }
-
-  let s:I1 = airline#themes#get_highlight2(['DiffAdded', 'bg'], ['DiffAdded', 'fg'], 'bold')
-  let s:I2 = airline#themes#get_highlight2(['DiffAdded', 'fg'], ['Normal', 'bg'])
-  let s:I3 = s:N3
-  let g:airline#themes#base16#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
-  let g:airline#themes#base16#palette.insert_modified = g:airline#themes#base16#palette.normal_modified
-
-  let s:R1 = airline#themes#get_highlight2(['WarningMsg', 'bg'], ['WarningMsg', 'fg'], 'bold')
-  let s:R2 = s:N2
-  let s:R3 = s:N3
-  let g:airline#themes#base16#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
-  let g:airline#themes#base16#palette.replace_modified = g:airline#themes#base16#palette.normal_modified
-
-  let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Constant', 'fg'], 'bold')
-  let s:V2 = airline#themes#get_highlight2(['Constant', 'fg'], ['Normal', 'bg'])
-  let s:V3 = s:N3
-  let g:airline#themes#base16#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
-  let g:airline#themes#base16#palette.visual_modified = g:airline#themes#base16#palette.normal_modified
-
-  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)
-  call s:load_constant()
 else
-  call s:load_dynamic()
-  augroup airline_base16
-    autocmd!
-    autocmd ColorScheme * call <sid>load_dynamic() | call airline#load_theme()
-  augroup END
+  function! airline#themes#base16#refresh()
+    let g:airline#themes#base16#palette = {}
+
+    let g:airline#themes#base16#palette.accents = {
+          \ 'red': airline#themes#get_highlight('Constant'),
+          \ }
+
+    let s:N1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['DiffText', 'fg'], 'bold')
+    let s:N2 = airline#themes#get_highlight2(['Visual', 'fg'], ['Visual', 'bg'])
+    let s:N3 = airline#themes#get_highlight('CursorLine')
+    let g:airline#themes#base16#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+    let group = airline#themes#get_highlight('vimCommand')
+    let g:airline#themes#base16#palette.normal_modified = {
+          \ 'statusline': [ group[0], '', group[2], '', '' ]
+          \ }
+
+    let s:I1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['DiffAdded', 'fg'], 'bold')
+    let s:I2 = airline#themes#get_highlight2(['DiffAdded', 'fg'], ['Normal', 'bg'])
+    let s:I3 = s:N3
+    let g:airline#themes#base16#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+    let g:airline#themes#base16#palette.insert_modified = g:airline#themes#base16#palette.normal_modified
+
+    let s:R1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['WarningMsg', 'fg'], 'bold')
+    let s:R2 = s:N2
+    let s:R3 = s:N3
+    let g:airline#themes#base16#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+    let g:airline#themes#base16#palette.replace_modified = g:airline#themes#base16#palette.normal_modified
+
+    let s:V1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['Constant', 'fg'], 'bold')
+    let s:V2 = airline#themes#get_highlight2(['Constant', 'fg'], ['Normal', 'bg'])
+    let s:V3 = s:N3
+    let g:airline#themes#base16#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+    let g:airline#themes#base16#palette.visual_modified = g:airline#themes#base16#palette.normal_modified
+
+    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)
+    let g:airline#themes#base16#palette.inactive_modified = {
+          \ 'airline_c': [ group[0], '', group[2], '', '' ]
+          \ }
+  endfunction
+  call airline#themes#base16#refresh()
 endif
 

autoload/airline/themes/bubblegum.vim

@@ -20,15 +20,13 @@ let s:cterm_red = 174
 let s:gui_pink = '#d7afd7'
 let s:cterm_pink = 182
 
-let s:file  = ['#ff0000', '', 160, '', '']
-
 let g:airline#themes#bubblegum#palette = {}
 
 " Normal mode
 let s:N1 = [s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green]
 let s:N2 = [s:gui_light_gray, s:gui_med_gray_lo, s:cterm_light_gray, s:cterm_med_gray_lo]
 let s:N3 = [s:gui_green, s:gui_med_gray_hi, s:cterm_green, s:cterm_med_gray_hi]
-let g:airline#themes#bubblegum#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#bubblegum#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 let g:airline#themes#bubblegum#palette.normal_modified = {
       \ 'airline_c': [s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, ''],
       \ }
@@ -36,7 +34,7 @@ let g:airline#themes#bubblegum#palette.normal_modified = {
 " Insert mode
 let s:I1 = [s:gui_med_gray_hi, s:gui_blue, s:cterm_med_gray_hi, s:cterm_blue]
 let s:I3 = [s:gui_blue, s:gui_med_gray_hi, s:cterm_blue, s:cterm_med_gray_hi]
-let g:airline#themes#bubblegum#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3, s:file)
+let g:airline#themes#bubblegum#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3)
 let g:airline#themes#bubblegum#palette.insert_modified = copy(g:airline#themes#bubblegum#palette.normal_modified)
 let g:airline#themes#bubblegum#palette.insert_paste = {
       \ 'airline_a': [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
@@ -52,13 +50,21 @@ let g:airline#themes#bubblegum#palette.replace_modified = copy(g:airline#themes#
 " Visual mode
 let s:V1 = [s:gui_dark_gray, s:gui_pink, s:cterm_dark_gray, s:cterm_pink]
 let s:V3 = [s:gui_pink, s:gui_med_gray_hi, s:cterm_pink, s:cterm_med_gray_hi]
-let g:airline#themes#bubblegum#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3, s:file)
+let g:airline#themes#bubblegum#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3)
 let g:airline#themes#bubblegum#palette.visual_modified = copy(g:airline#themes#bubblegum#palette.insert_modified)
 
 " 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 s:IA = [s:gui_light_gray, s:gui_med_gray_hi, s:cterm_light_gray, s:cterm_med_gray_hi, '']
+let g:airline#themes#bubblegum#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
 let g:airline#themes#bubblegum#palette.inactive_modified = {
       \ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
       \ }
 
+" CtrlP
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#bubblegum#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, '' ] ,
+      \ [ s:gui_orange, s:gui_med_gray_lo, s:cterm_orange, s:cterm_med_gray_lo, '' ] ,
+      \ [ s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green, 'bold' ] )

autoload/airline/themes/dark.vim

@@ -16,35 +16,22 @@
 " simply overwrite the previous colors.  If you want simultaneous overrides,
 " then they will need to change different parts of the statusline so they do
 " not conflict with each other.
-
-" First let's define some arrays.  The s: is just a VimL thing for scoping the
-" variables to the current script.  Without this, these variables would be
-" declared globally.
 "
-" The array is in the format [ guifg, guibg, ctermfg, ctermbg, opts ].
-" The opts takes in values from ":help attr-list".
+" First, let's define an empty dictionary and assign it to the "palette"
+" variable. The # is a separator that maps with the directory structure. If
+" you get this wrong, Vim will complain loudly.
+let g:airline#themes#dark#palette = {}
+
+" First let's define some arrays. The s: is just a VimL thing for scoping the
+" variables to the current script. Without this, these variables would be
+" declared globally. Now let's declare some colors for normal mode and add it
+" to the dictionary.  The array is in the format:
+" [ guifg, guibg, ctermfg, ctermbg, opts ]. See "help attr-list" for valid
+" values for the "opt" value.
 let s:N1   = [ '#00005f' , '#dfff00' , 17  , 190 ]
 let s:N2   = [ '#ffffff' , '#444444' , 255 , 238 ]
 let s:N3   = [ '#9cffd3' , '#202020' , 85  , 234 ]
-
-" The file array is a special case, where only the foreground colors are
-" specified.  The background colors are automatically filled.
-let s:file = [ '#ff0000' , ''        , 160 , ''  ]
-
-" vim-airline is made up of multiple sections, but for theming purposes there
-" is only 3 sections: the mode, the branch indicator, and the gutter (which
-" then get mirrored on the right side).  generate_color_map is a helper
-" function which generates a dictionary which declares the full colorscheme
-" for the statusline.  See the source code of "autoload/airline/themes.vim"
-" for the full set of keys available for theming.
-
-" First, let's define a palette.  Airline will search for this variable.
-" The # is a separator that maps with the directory structure. If you get
-" this wrong, Vim will complain loudly.
-let g:airline#themes#dark#palette = {}
-
-" Now let's declare some colors for normal mode and add it to the dictionary.
-let g:airline#themes#dark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#dark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
 " Here we define overrides for when the buffer is modified.  This will be
 " applied after g:airline#themes#dark#palette.normal, hence why only certain keys are
@@ -57,7 +44,7 @@ let g:airline#themes#dark#palette.normal_modified = {
 let s:I1 = [ '#00005f' , '#00dfff' , 17  , 45  ]
 let s:I2 = [ '#ffffff' , '#005fff' , 255 , 27  ]
 let s:I3 = [ '#ffffff' , '#000080' , 15  , 17  ]
-let g:airline#themes#dark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#dark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 let g:airline#themes#dark#palette.insert_modified = {
       \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
       \ }
@@ -74,7 +61,7 @@ let g:airline#themes#dark#palette.replace_modified = g:airline#themes#dark#palet
 let s:V1 = [ '#000000' , '#ffaf00' , 232 , 214 ]
 let s:V2 = [ '#000000' , '#ff5f00' , 232 , 202 ]
 let s:V3 = [ '#ffffff' , '#5f0000' , 15  , 52  ]
-let g:airline#themes#dark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#dark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 let g:airline#themes#dark#palette.visual_modified = {
       \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
       \ }
@@ -83,12 +70,24 @@ let g:airline#themes#dark#palette.visual_modified = {
 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 = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
 let g:airline#themes#dark#palette.inactive_modified = {
       \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
       \ }
 
 
+" Accents are used to give parts within a section a slightly different look or
+" color. Here we are defining a "red" accent, which is used by the 'readonly'
+" part by default. Only the foreground colors are specified, so the background
+" colors are automatically extracted from the underlying section colors. What
+" this means is that regardless of which section the part is defined in, it
+" will be red instead of the section's foreground color. You can also have
+" multiple parts with accents within a section.
+let g:airline#themes#dark#palette.accents = {
+      \ 'red': [ '#ff0000' , '' , 160 , ''  ]
+      \ }
+
+
 " Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
 " variable so that related functionality is loaded iff the user is using
 " ctrlp. Note that this is optional, and if you do not define ctrlp colors

autoload/airline/themes/durant.vim

@@ -0,0 +1,59 @@
+let s:N1 = [ '#005f00' , '#afd700' , 22  , 148 ]
+let s:N2 = [ '#93a1a1' , '#586e75' , 245 , 240 ]
+let s:N3 = [ '#93a1a1' , '#073642' , 240 , 233 ]
+let g:airline#themes#durant#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+
+let g:airline#themes#durant#normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+
+
+
+let s:I1 = [ '#ffffff' , '#00875f' , 255 , 29  ]
+let s:I2 = [ '#9e9e9e' , '#303030' , 247 , 236 ]
+let s:I3 = [ '#87d7ff' , '#005f87' , 117 , 24  ]
+let g:airline#themes#durant#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#durant#palette.insert_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+let g:airline#themes#durant#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#durant#palette.replace = copy(g:airline#themes#durant#palette.insert)
+let g:airline#themes#durant#palette.replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
+
+let g:airline#themes#durant#palette.replace_modified = g:airline#themes#durant#palette.insert_modified
+
+let s:V1 = [ '#1a1a18' , '#ffffff' , 232 , 255 ]
+let s:V2 = [ '#ffffff' , '#44403a' , 255, 238 ]
+let s:V3 = [ '#90a680' , '#2e2d2a' , 64, 235 ]
+let g:airline#themes#durant#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#durant#palette.visual_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+
+
+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#durant#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#durant#palette.inactive_modified = {
+      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
+      \ }
+
+
+let g:airline#themes#durant#palette.accents = {
+      \ 'red': [ '#ff0000' , '' , 160 , ''  ]
+      \ }
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+  let g:airline#themes#durant#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+        \ [ '#d7d7ff' , '#5f00af' , 189 , 55  , ''     ],
+        \ [ '#ffffff' , '#875fd7' , 231 , 98  , ''     ],
+        \ [ '#5f00af' , '#ffffff' , 55  , 231 , 'bold' ])
+

autoload/airline/themes/hybrid.vim

@@ -0,0 +1,58 @@
+" vim-airline companion theme of Hybrid
+" (https://github.com/w0ng/vim-hybrid)
+
+let g:airline#themes#hybrid#palette = {}
+
+function! airline#themes#hybrid#refresh()
+    let s:N1 = airline#themes#get_highlight('DiffAdd')
+    let s:N2 = airline#themes#get_highlight('CursorLine')
+    let s:N3 = airline#themes#get_highlight('PMenu')
+    let g:airline#themes#hybrid#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+    let modified_group = airline#themes#get_highlight2(['Text', 'fg'], ['SpellRare', 'bg'], 'bold')
+    let g:airline#themes#hybrid#palette.normal_modified = {
+                \ 'airline_c': airline#themes#get_highlight2(['Text', 'fg'], ['SpellRare', 'bg'], 'bold')
+                \ }
+
+    let warning_group = airline#themes#get_highlight('SpellRare')
+    let g:airline#themes#hybrid#palette.normal.airline_warning = warning_group
+    let g:airline#themes#hybrid#palette.normal_modified.airline_warning = warning_group
+
+    let s:I1 = airline#themes#get_highlight2(['Text', 'fg'], ['DiffText', 'bg'], 'bold')
+    let s:I2 = airline#themes#get_highlight2(['Text', 'fg'], ['SpellLocal', 'bg'], 'bold')
+    let s:I3 = airline#themes#get_highlight2(['Text', 'fg'], ['SpellCap', 'bg'], 'bold')
+    let g:airline#themes#hybrid#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+    let g:airline#themes#hybrid#palette.insert_modified = g:airline#themes#hybrid#palette.normal_modified
+    let g:airline#themes#hybrid#palette.insert.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
+    let g:airline#themes#hybrid#palette.insert_modified.airline_warning = g:airline#themes#hybrid#palette.normal_modified.airline_warning
+
+    let s:R1 = airline#themes#get_highlight('DiffChange')
+    let s:R2 = s:N2
+    let s:R3 = s:N3
+    let g:airline#themes#hybrid#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+    let replace_group = airline#themes#get_highlight('SpellRare')
+    let g:airline#themes#hybrid#palette.replace_modified = g:airline#themes#hybrid#palette.normal_modified
+    let g:airline#themes#hybrid#palette.replace.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
+    let g:airline#themes#hybrid#palette.replace_modified.airline_warning = g:airline#themes#hybrid#palette.replace_modified.airline_warning
+
+    let s:V1 = airline#themes#get_highlight2(['Text', 'fg'], ['Folded', 'bg'], 'bold')
+    let s:V2 = airline#themes#get_highlight2(['Text', 'fg'], ['DiffDelete', 'bg'], 'bold')
+    let s:V3 = airline#themes#get_highlight2(['Text', 'fg'], ['Error', 'bg'], 'bold')
+    let g:airline#themes#hybrid#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+    let g:airline#themes#hybrid#palette.visual_modified = g:airline#themes#hybrid#palette.normal_modified
+    let g:airline#themes#hybrid#palette.visual.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
+    let g:airline#themes#hybrid#palette.visual_modified.airline_warning = g:airline#themes#hybrid#palette.normal_modified.airline_warning
+
+    let s:IA = airline#themes#get_highlight('StatusLineNC')
+    let g:airline#themes#hybrid#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+    let g:airline#themes#hybrid#palette.inactive_modified = {
+                \ 'airline_c': [ modified_group[0], '', modified_group[2], '', '' ]
+                \ }
+
+    let g:airline#themes#hybrid#palette.accents = {
+                \ 'red': airline#themes#get_highlight('Constant'),
+                \ }
+
+endfunction
+
+call airline#themes#hybrid#refresh()

autoload/airline/themes/jellybeans.vim

@@ -1,6 +1,7 @@
 let g:airline#themes#jellybeans#palette = {}
 
-function! s:generate()
+" The name of the function must be 'refresh'.
+function! airline#themes#jellybeans#refresh()
   " This theme is an example of how to use helper functions to extract highlight
   " values from the corresponding colorscheme. It was written in a hurry, so it
   " is very minimalistic. If you are a jellybeans user and want to make updates,
@@ -11,9 +12,12 @@ function! s:generate()
   let s:N1 = airline#themes#get_highlight('DbgCurrent', '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#jellybeans#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+  let g:airline#themes#jellybeans#palette.accents = {
+        \ 'red': airline#themes#get_highlight('Constant'),
+        \ }
+
+  let g:airline#themes#jellybeans#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
   let g:airline#themes#jellybeans#palette.normal_modified = {
         \ 'airline_c': [ '#ffb964', '', 215, '', '' ]
         \ }
@@ -21,13 +25,13 @@ function! s:generate()
   let s:I1 = airline#themes#get_highlight('DiffAdd', 'bold')
   let s:I2 = s:N2
   let s:I3 = s:N3
-  let g:airline#themes#jellybeans#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+  let g:airline#themes#jellybeans#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
   let g:airline#themes#jellybeans#palette.insert_modified = g:airline#themes#jellybeans#palette.normal_modified
 
   let s:R1 = airline#themes#get_highlight('WildMenu', 'bold')
   let s:R2 = s:N2
   let s:R3 = s:N3
-  let g:airline#themes#jellybeans#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
+  let g:airline#themes#jellybeans#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
   let g:airline#themes#jellybeans#palette.replace_modified = g:airline#themes#jellybeans#palette.normal_modified
 
   " Sometimes you want to mix and match colors from different groups, you can do
@@ -35,17 +39,14 @@ function! s:generate()
   let s:V1 = airline#themes#get_highlight2(['TabLineSel', 'bg'], ['DiffDelete', 'bg'], 'bold')
   let s:V2 = s:N2
   let s:V3 = s:N3
-  let g:airline#themes#jellybeans#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+  let g:airline#themes#jellybeans#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
   let g:airline#themes#jellybeans#palette.visual_modified = g:airline#themes#jellybeans#palette.normal_modified
 
   " 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 = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
   let g:airline#themes#jellybeans#palette.inactive_modified = g:airline#themes#jellybeans#palette.normal_modified
 endfunction
 
-call s:generate()
-augroup airline_jellybeans
-  autocmd!
-  autocmd ColorScheme * call <sid>generate()
-augroup END
+call airline#themes#jellybeans#refresh()
+

autoload/airline/themes/kalisi.vim

@@ -0,0 +1,70 @@
+"
+" Colorscheme: Kalisi for airline. Inspired by powerline.
+" Arthur Jaron
+" hifreeo@gmail.com
+" 24.10.2014 
+ 
+" Visual mode                                   
+let s:V1 = [ '#0087ff' , '#ffffff','33','231']
+let s:V2 = [ '#005faf' , '#5fafff','25','75']
+let s:V3 = [ '#87d7ff' , '#005faf','117','25']
+
+" Replace mode
+let s:R1 = [ '#d75fff' , '#ffffff','171','231']
+let s:R2 = [ '#5f005f' , '#d75fff','53','171']
+let s:R3 = [ '#ff87ff' , '#8700af','213','91']
+
+let g:airline#themes#kalisi#palette = {}
+
+
+function! airline#themes#kalisi#refresh()
+
+  let s:StatusLine = airline#themes#get_highlight('StatusLine')
+  let s:StatusLineNC = airline#themes#get_highlight('StatusLineNC')
+
+  " Insert mode                                    
+  let s:I1 = [ '#ffffff' , '#e80000','231','160']
+  let s:I2 = [ '#ff0000' , '#5f0000','196','52']
+  let s:I3 = s:StatusLine
+
+  " Normal mode
+  let s:N1 = [ '#005f00' , '#afd700','22','148'] 
+  let s:N2 = [ '#afd700' , '#005f00','148','22'] 
+  let s:N3 = s:StatusLine
+
+  " Tabline Plugin
+  let g:airline#themes#kalisi#palette.tabline = {
+        \ 'airline_tab':    ['#bcbcbc', '#005f00','250','22'],
+        \ 'airline_tabsel': ['#404042', '#A6DB29','238','148'],
+        \ 'airline_tabtype':['#afd700', '#204d20','148','22'],
+        \ 'airline_tabfill': s:StatusLine,
+        \ 'airline_tabhid': ['#c5c5c5', '#404042','251','238'],
+        \ 'airline_tabmod': ['#d7ff00', '#afd700','190','148'],
+        \ 'airline_tabmod_unsel':  ['#d7ff00', '#005f00','190','22']
+        \ }
+
+  let g:airline#themes#kalisi#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+  let g:airline#themes#kalisi#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+  let g:airline#themes#kalisi#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+  let g:airline#themes#kalisi#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+  " Inactive Mode
+  let s:IA = airline#themes#get_highlight('StatusLineNC')
+  let g:airline#themes#kalisi#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#kalisi#palette.inactive_modified = {
+        \ 'airline_c':  ['#d7ff00', s:IA[1],'190',s:IA[3]],
+        \ }
+
+endfunction
+
+call airline#themes#kalisi#refresh()
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#kalisi#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ s:StatusLine,
+      \ ['#afd700', '#005f00','148','22'],
+      \ [ '#005f00' , '#afd700' , '22','148']
+      \)
+

autoload/airline/themes/kolor.vim

@@ -0,0 +1,59 @@
+let g:airline#themes#kolor#palette = {}
+
+let s:N1 = [ '#e2e2e2' , '#4f3598' , 254 , 56  ]
+let s:N2 = [ '#ff5fd7' , '#242322' , 206 , 234 ]
+let s:N3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
+
+let g:airline#themes#kolor#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let g:airline#themes#kolor#palette.normal_modified = {
+      \ 'airline_c': [ '#e2e2e2' , '#4f3598' , 254     , 56      , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#242322' , '#7eaefd' , 234 , 111 ]
+let s:I2 = [ '#75d7d8' , '#242322' , 80  , 234 ]
+let s:I3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
+let g:airline#themes#kolor#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#kolor#palette.insert_modified = {
+      \ 'airline_c': [ '#242322' , '#7eaefd' , 234     , 111     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#kolor#palette.replace = copy(g:airline#themes#kolor#palette.insert)
+let g:airline#themes#kolor#palette.replace.airline_a = [ s:I2[0]   , '#005154' , s:I2[2] , 23      , ''     ]
+let g:airline#themes#kolor#palette.replace_modified = {
+      \ 'airline_c': [ '#e2e2e2' , '#005154' , 254 , 23  , '' ] ,
+      \ }
+
+
+let s:V1 = [ '#242322' , '#e6987a' , 234 , 180 ]
+let s:V2 = [ '#dbc570' , '#242322' , 186 , 234 ]
+let s:V3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
+let g:airline#themes#kolor#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#kolor#palette.visual_modified = {
+      \ 'airline_c': [ '#242322' , '#e6987a' , 234     , 180      , ''     ] ,
+      \ }
+
+
+let s:IA1 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 , '' ]
+let s:IA2 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 ]
+let s:IA3 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 , '' ]
+let g:airline#themes#kolor#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#kolor#palette.inactive_modified = {
+      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
+      \ }
+
+
+let g:airline#themes#kolor#palette.accents = {
+      \ 'red': [ '#d96e8a' , '' , 168 , ''  ]
+      \ }
+
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#kolor#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#e2e2e2' , '#4a4a4a' , 254 , 238 , ''     ],
+      \ [ '#e2e2e2' , '#242322' , 254 , 234 , ''     ],
+      \ [ '#e2e2e2' , '#4f3598' , 254 , 56  , 'bold' ])

autoload/airline/themes/laederon.vim

@@ -24,19 +24,22 @@ let s:RE = [ '#233e09' , 22 ] " oakleaf
 " Paste mode
 let s:PA = [ '#ab3e5d' , 161 ] " raspberry
 
-let s:file = [ '#ef393d' , '' , 196 , '' , '' ]
 let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3], s:N3[3] , '' ]
 
 
 let g:airline#themes#laederon#palette = {}
 
-let g:airline#themes#laederon#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#laederon#palette.accents = {
+      \ 'red': [ '#ef393d' , '' , 196 , '' , '' ]
+      \ }
+
+let g:airline#themes#laederon#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 let g:airline#themes#laederon#palette.normal_modified = {
       \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
       \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
 
 
-let g:airline#themes#laederon#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#laederon#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 let g:airline#themes#laederon#palette.insert_modified = {
       \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
 let g:airline#themes#laederon#palette.insert_paste = {
@@ -48,12 +51,12 @@ let g:airline#themes#laederon#palette.replace.airline_a = [ s:I1[0] , s:RE[0] ,
 let g:airline#themes#laederon#palette.replace_modified = g:airline#themes#laederon#palette.insert_modified
 
 
-let g:airline#themes#laederon#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#laederon#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 let g:airline#themes#laederon#palette.visual_modified = {
       \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
 
 
-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 = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
 let g:airline#themes#laederon#palette.inactive_modified = {
       \ 'airline_c' : [ s:V1[1] , ''      , s:V1[3] , ''      , '' ] }
 

autoload/airline/themes/light.vim

@@ -1,10 +1,9 @@
 let g:airline#themes#light#palette = {}
 
-let s:file = [ '#df0000' , '' , 160 , '' ]
 let s:N1 = [ '#ffffff' , '#005fff' , 255 , 27  ]
 let s:N2 = [ '#000087' , '#00dfff' , 18  , 45  ]
 let s:N3 = [ '#005fff' , '#afffff' , 27  , 159 ]
-let g:airline#themes#light#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#light#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 let g:airline#themes#light#palette.normal_modified = {
       \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
       \ }
@@ -13,7 +12,7 @@ let g:airline#themes#light#palette.normal_modified = {
 let s:I1 = [ '#ffffff' , '#00875f' , 255 , 29  ]
 let s:I2 = [ '#005f00' , '#00df87' , 22  , 42  ]
 let s:I3 = [ '#005f5f' , '#afff87' , 23  , 156 ]
-let g:airline#themes#light#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#light#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 let g:airline#themes#light#palette.insert_modified = {
       \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
       \ }
@@ -30,7 +29,7 @@ let g:airline#themes#light#palette.replace_modified = g:airline#themes#light#pal
 let s:V1 = [ '#ffffff' , '#ff5f00' , 255 , 202 ]
 let s:V2 = [ '#5f0000' , '#ffaf00' , 52  , 214 ]
 let s:V3 = [ '#df5f00' , '#ffff87' , 166 , 228 ]
-let g:airline#themes#light#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#light#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 let g:airline#themes#light#palette.visual_modified = {
       \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
       \ }
@@ -39,7 +38,7 @@ let g:airline#themes#light#palette.visual_modified = {
 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 = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
 let g:airline#themes#light#palette.inactive_modified = {
       \ 'airline_c': [ '#df0000' , ''        , 160     , ''      , ''     ] ,
       \ }

autoload/airline/themes/lucius.vim

@@ -0,0 +1,56 @@
+let g:airline#themes#lucius#palette = {}
+
+function! airline#themes#lucius#refresh()
+
+    let s:N1 = airline#themes#get_highlight('StatusLine')
+    let s:N2 = airline#themes#get_highlight('Folded')
+    let s:N3 = airline#themes#get_highlight('CursorLine')
+    let g:airline#themes#lucius#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+    let modified_group = airline#themes#get_highlight('Statement')
+    let g:airline#themes#lucius#palette.normal_modified = {
+                \ 'airline_c': [modified_group[0], '', modified_group[2], '', '']
+                \ }
+
+    let warning_group = airline#themes#get_highlight('DiffDelete')
+    let g:airline#themes#lucius#palette.normal.airline_warning = warning_group
+    let g:airline#themes#lucius#palette.normal_modified.airline_warning = warning_group
+
+    let s:I1 = airline#themes#get_highlight('DiffAdd')
+    let s:I2 = s:N2
+    let s:I3 = s:N3
+    let g:airline#themes#lucius#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+    let g:airline#themes#lucius#palette.insert_modified = g:airline#themes#lucius#palette.normal_modified
+    let g:airline#themes#lucius#palette.insert.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
+    let g:airline#themes#lucius#palette.insert_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
+
+    let s:R1 = airline#themes#get_highlight('DiffChange')
+    let s:R2 = s:N2
+    let s:R3 = s:N3
+    let g:airline#themes#lucius#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+    let g:airline#themes#lucius#palette.replace_modified = g:airline#themes#lucius#palette.normal_modified
+    let g:airline#themes#lucius#palette.replace.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
+    let g:airline#themes#lucius#palette.replace_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
+
+    let s:V1 = airline#themes#get_highlight('Cursor')
+    let s:V2 = s:N2
+    let s:V3 = s:N3
+    let g:airline#themes#lucius#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+    let g:airline#themes#lucius#palette.visual_modified = g:airline#themes#lucius#palette.normal_modified
+    let g:airline#themes#lucius#palette.visual.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
+    let g:airline#themes#lucius#palette.visual_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
+
+    let s:IA = airline#themes#get_highlight('StatusLineNC')
+    let g:airline#themes#lucius#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+    let g:airline#themes#lucius#palette.inactive_modified = {
+                \ 'airline_c': [ modified_group[0], '', modified_group[2], '', '' ]
+                \ }
+
+    let g:airline#themes#lucius#palette.accents = {
+                \ 'red': airline#themes#get_highlight('Constant'),
+                \ }
+
+endfunction
+
+call airline#themes#lucius#refresh()
+

autoload/airline/themes/luna.vim

@@ -2,13 +2,16 @@
 " (https://github.com/Pychimp/vim-luna)
 
 let g:airline#themes#luna#palette = {}
-let s:file = [ '#ffffff' , '' , 231 , '' , '' ]
+
+let g:airline#themes#luna#palette.accents = {
+      \ 'red': [ '#ffffff' , '' , 231 , '' , '' ],
+      \ }
 
 
 let s:N1 = [ '#ffffff' , '#005252' , 231  , 36 ]
 let s:N2 = [ '#ffffff' , '#003f3f' , 231 , 29 ]
 let s:N3 = [ '#ffffff' , '#002b2b' , 231  , 23 ]
-let g:airline#themes#luna#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#luna#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 let g:airline#themes#luna#palette.normal_modified = {
       \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
       \ }
@@ -17,7 +20,7 @@ let g:airline#themes#luna#palette.normal_modified = {
 let s:I1 = [ '#ffffff' , '#789f00' , 231 , 106 ]
 let s:I2 = [ '#ffffff' , '#003f3f' , 231 , 29  ]
 let s:I3 = [ '#ffffff' , '#002b2b' , 231 , 23  ]
-let g:airline#themes#luna#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#luna#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 let g:airline#themes#luna#palette.insert_modified = {
       \ 'airline_c': [ '#ffffff' , '#005e5e' , 255     , 52      , ''     ] ,
       \ }
@@ -33,17 +36,51 @@ let g:airline#themes#luna#palette.replace_modified = g:airline#themes#luna#palet
 let s:V1 = [ '#ffff9a' , '#ff8036' , 222 , 208 ]
 let s:V2 = [ '#ffffff' , '#003f3f' , 231 , 29 ]
 let s:V3 = [ '#ffffff' , '#002b2b' , 231  , 23  ]
-let g:airline#themes#luna#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#luna#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 let g:airline#themes#luna#palette.visual_modified = {
       \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
       \ }
 
 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 = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
 let g:airline#themes#luna#palette.inactive_modified = {
-      \ 'airline_c': [ '#450000' , ''        , 52      , ''      , ''     ] ,
+      \ 'airline_c': [ '#e20000' , ''        , 166      , ''      , ''     ] ,
       \ }
 
+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, ''],
+      \ }
+
+let s:WI = [ '#ffffff', '#5f0000', 231, 88 ]
+let g:airline#themes#luna#palette.normal.airline_warning = [
+     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+     \ ]
+
+let g:airline#themes#luna#palette.normal_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.insert.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.insert_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.visual.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.visual_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.replace.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.replace_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
 
 if !get(g:, 'loaded_ctrlp', 0)
   finish
@@ -53,10 +90,3 @@ let g:airline#themes#luna#palette.ctrlp = airline#extensions#ctrlp#generate_colo
       \ [ '#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

@@ -1,14 +1,16 @@
 let g:airline#themes#molokai#palette = {}
 
+let g:airline#themes#molokai#palette.accents = {
+      \ 'red': [ '#66d9ef' , '' , 81 , '' , '' ],
+      \ }
 
-let s:file = [ '#66d9ef' , '' , 81 , '' , '' ]
 
 " Normal mode
 let s:N1 = [ '#080808' , '#e6db74' , 232 , 144 ] " mode
 let s:N2 = [ '#f8f8f0' , '#232526' , 253 , 16  ] " info
 let s:N3 = [ '#f8f8f0' , '#465457' , 253 , 67  ] " statusline
 
-let g:airline#themes#molokai#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#molokai#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 let g:airline#themes#molokai#palette.normal_modified = {
       \ 'airline_c': [ '#080808' , '#e6db74' , 232 , 144 , '' ] ,
       \ }
@@ -19,7 +21,7 @@ let s:I1 = [ '#080808' , '#66d9ef' , 232 , 81 ]
 let s:I2 = [ '#f8f8f0' , '#232526' , 253 , 16 ]
 let s:I3 = [ '#f8f8f0' , '#465457' , 253 , 67 ]
 
-let g:airline#themes#molokai#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#molokai#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 let g:airline#themes#molokai#palette.insert_modified = {
       \ 'airline_c': [ '#080808' , '#66d9ef' , 232 , 81 , '' ] ,
       \ }
@@ -38,7 +40,7 @@ let s:V1 = [ '#080808' , '#fd971f' , 232 , 208 ]
 let s:V2 = [ '#f8f8f0' , '#232526' , 253 , 16  ]
 let s:V3 = [ '#f8f8f0' , '#465457' , 253 , 67  ]
 
-let g:airline#themes#molokai#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#molokai#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 let g:airline#themes#molokai#palette.visual_modified = {
       \ 'airline_c': [ '#080808' , '#fd971f' , 232 , 208 , '' ] ,
       \ }
@@ -46,7 +48,7 @@ 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 = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
 let g:airline#themes#molokai#palette.inactive_modified = {
       \ 'airline_c': [ '#f8f8f0' , ''        , 253 , ''  , '' ] ,
       \ }

autoload/airline/themes/monochrome.vim

@@ -0,0 +1,15 @@
+let g:airline#themes#monochrome#palette = {}
+
+function! airline#themes#monochrome#refresh()
+  let s:SL = airline#themes#get_highlight('StatusLine')
+  let g:airline#themes#monochrome#palette.normal = airline#themes#generate_color_map(s:SL, s:SL, s:SL)
+  let g:airline#themes#monochrome#palette.insert = g:airline#themes#monochrome#palette.normal
+  let g:airline#themes#monochrome#palette.replace = g:airline#themes#monochrome#palette.normal
+  let g:airline#themes#monochrome#palette.visual = g:airline#themes#monochrome#palette.normal
+
+  let s:SLNC = airline#themes#get_highlight('StatusLineNC')
+  let g:airline#themes#monochrome#palette.inactive = airline#themes#generate_color_map(s:SLNC, s:SLNC, s:SLNC)
+endfunction
+
+call airline#themes#monochrome#refresh()
+

autoload/airline/themes/murmur.vim

@@ -0,0 +1,82 @@
+let g:airline#themes#murmur#palette = {}
+
+" Color palette
+let s:cterm_termbg    = 237  " Background for branch and file format blocks
+let s:gui_termbg      = '#5F5F5F'
+let s:cterm_termfg    = 144  " Foreground for branch and file format blocks
+let s:gui_termfg      = '#AFAF87'
+
+let s:cterm_termbg2   = 234  " Background for middle block
+let s:gui_termbg2     = '#1C1C1C'
+let s:cterm_termfg2   = 39   " Foreground for middle block
+let s:gui_termfg2     = '#F5F5F5'
+
+let s:cterm_normalbg  = 27   " Background for normal mode and file position blocks
+let s:gui_normalbg    = '#5F87FF'
+let s:cterm_normalfg  = 15   " Foreground for normal mode and file position blocks
+let s:gui_normalfg    = '#FFFFFF'
+
+let s:cterm_insertbg  = 70   " Background for insert mode and file position blocks
+let s:gui_insertbg    = '#87AF5F'
+let s:cterm_insertfg  = 15   " Foreground for insert mode and file position blocks
+let s:gui_insertfg    = '#FFFFFF'
+
+let s:cterm_visualbg  = 166  " Background for visual mode and file position blocks
+let s:gui_visualbg    = '#ff8c00'
+let s:cterm_visualfg  = 15   " Foreground for visual mode and file position blocks
+let s:gui_visualfg    = '#FFFFFF'
+
+let s:cterm_replacebg = 88   " Background for replace mode and file position blocks
+let s:gui_replacebg   = '#870000'
+let s:cterm_replacefg = 15   " Foreground for replace mode and file position blocks
+let s:gui_replacefg   = '#FFFFFF'
+
+let s:cterm_alert     = 88   " Modified file alert color
+let s:gui_alert       = '#870000'
+
+let s:cterm_inactivebg = 234 " Background for inactive mode
+let s:gui_inactivebg   = '#1C1C1C'
+let s:cterm_inactivefg = 239 " Foreground for inactive mode
+let s:gui_inactivefg   = '#4E4E4E'
+
+" Branch and file format
+let s:BB = [s:gui_termfg, s:gui_termbg, s:cterm_termfg, s:cterm_termbg] " Branch and file format blocks
+
+" Normal mode
+let s:N1 = [s:gui_normalfg, s:gui_normalbg, s:cterm_normalfg, s:cterm_normalbg] " Outside blocks in normal mode
+let s:N2 = [s:gui_termfg2, s:gui_termbg2, s:cterm_normalbg, s:cterm_termbg2]     " Middle block
+let g:airline#themes#murmur#palette.normal = airline#themes#generate_color_map(s:N1, s:BB, s:N2)
+let g:airline#themes#murmur#palette.normal_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Insert mode
+let s:I1 = [s:gui_insertfg, s:gui_insertbg, s:cterm_insertfg, s:cterm_insertbg] " Outside blocks in insert mode
+let s:I2 = [s:gui_insertbg, s:gui_termbg2, s:cterm_insertbg, s:cterm_termbg2]   " Middle block
+let g:airline#themes#murmur#palette.insert = airline#themes#generate_color_map(s:I1, s:BB, s:I2)
+let g:airline#themes#murmur#palette.insert_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Replace mode
+let s:R1 = [s:gui_replacefg, s:gui_replacebg, s:cterm_replacefg, s:cterm_replacebg]  " Outside blocks in replace mode
+let s:R2 = [s:gui_termfg, s:gui_termbg2, s:cterm_termfg, s:cterm_termbg2]            " Middle block
+let g:airline#themes#murmur#palette.replace = airline#themes#generate_color_map(s:R1, s:BB, s:R2)
+let g:airline#themes#murmur#palette.replace_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Visual mode
+let s:V1 = [s:gui_visualfg, s:gui_visualbg, s:cterm_visualfg, s:cterm_visualbg] " Outside blocks in visual mode
+let s:V2 = [s:gui_visualbg, s:gui_termbg2, s:cterm_visualbg, s:cterm_termbg2]   " Middle block
+let g:airline#themes#murmur#palette.visual = airline#themes#generate_color_map(s:V1, s:BB, s:V2)
+let g:airline#themes#murmur#palette.visual_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Inactive mode
+let s:IA1 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
+let s:IA2 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
+let s:IA3 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
+let g:airline#themes#murmur#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" CtrlP plugin colors
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#murmur#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [s:gui_normalfg, s:gui_normalbg, s:cterm_normalfg, s:cterm_normalbg, ''],
+      \ [s:gui_termfg, s:gui_termbg, s:cterm_termfg, s:cterm_termbg, ''],
+      \ [s:gui_termfg2, s:gui_termbg2, s:cterm_termfg2, s:cterm_termbg2, 'bold'])

autoload/airline/themes/powerlineish.vim

@@ -26,13 +26,11 @@ let s:V1 = [ '#080808' , '#ffaf00' , 232 , 214 ] " gray3          & brightestora
 " Replace mode                                   " fg             & bg
 let s:RE = [ '#ffffff' , '#d70000' , 231 , 160 ] " white          & brightred
 
-let s:file = copy(s:N3)
-
 let g:airline#themes#powerlineish#palette = {}
 
-let g:airline#themes#powerlineish#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#powerlineish#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
-let g:airline#themes#powerlineish#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#powerlineish#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 let g:airline#themes#powerlineish#palette.insert_replace = {
       \ 'airline_a': [ s:RE[0]   , s:I1[1]   , s:RE[1]   , s:I1[3]   , ''     ] }
 
@@ -44,5 +42,5 @@ let g:airline#themes#powerlineish#palette.replace.airline_a = [ s:RE[0] , s:RE[1
 
 
 let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
-let g:airline#themes#powerlineish#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:file)
+let g:airline#themes#powerlineish#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
 

autoload/airline/themes/raven.vim

@@ -0,0 +1,85 @@
+let g:airline#themes#raven#palette = {}
+
+let g:airline#themes#raven#palette.accents = {
+      \ 'red': [ '#ff2121' , '' , 196 , '' , '' ],
+      \ }
+
+let s:N1 = [ '#c8c8c8' , '#2e2e2e' , 188 , 235 ]
+let s:N2 = [ '#c8c8c8' , '#2e2e2e' , 188 , 235 ]
+let s:N3 = [ '#c8c8c8' , '#2e2e2e' , 188 , 235 ]
+let g:airline#themes#raven#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#raven#palette.normal_modified = {
+      \ 'airline_c': [ '#e25000' , '#2e2e2e' , 166 , 235 , '' ] ,
+      \ }
+
+let s:I1 = [ '#11c279' , '#2e2e2e' , 36 , 235 ]
+let s:I2 = [ '#11c279' , '#2e2e2e' , 36 , 235 ]
+let s:I3 = [ '#11c279' , '#2e2e2e' , 36 , 235 ]
+let g:airline#themes#raven#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#raven#palette.insert_modified = {
+      \ 'airline_c': [ '#e25000' , '#2e2e2e' , 166 , 235 , '' ] ,
+      \ }
+let g:airline#themes#raven#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#2e2e2e' , s:I1[2] , 235 , '' ] ,
+      \ }
+
+let g:airline#themes#raven#palette.replace = copy(g:airline#themes#raven#palette.insert)
+let g:airline#themes#raven#palette.replace.airline_a = [ '#e60000' , s:I1[1] , 160 , s:I1[3] , '' ]
+let g:airline#themes#raven#palette.replace.airline_z = [ '#e60000' , s:I1[1] , 160 , s:I1[3] , '' ]
+let g:airline#themes#raven#palette.replace_modified = g:airline#themes#raven#palette.insert_modified
+
+let s:V1 = [ '#6565ff' , '#2e2e2e' , 63 , 235 ]
+let s:V2 = [ '#6565ff' , '#2e2e2e' , 63 , 235 ]
+let s:V3 = [ '#6565ff' , '#2e2e2e' , 63 , 235 ]
+let g:airline#themes#raven#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#raven#palette.visual_modified = {
+      \ 'airline_c': [ '#e25000' , '#2e2e2e' , 166 , 235 , '' ] ,
+      \ }
+
+let s:IA = [ '#5e5e5e' , '#222222' , 59 , 235 , '' ]
+let g:airline#themes#raven#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#raven#palette.inactive_modified = {
+      \ 'airline_c': [ '#e25000' , '' , 166 , '' , '' ] ,
+       \ }
+
+let g:airline#themes#raven#palette.tabline = {
+      \ 'airline_tab':      ['#c8c8c8' , '#2e2e2e' , 188 , 235 , '' ],
+      \ 'airline_tabsel':   ['#2e2e2e' , '#a4c639' , 235 , 149 , '' ],
+      \ 'airline_tabtype':  ['#c8c8c8' , '#2e2e2e' , 188 , 235 , '' ],
+      \ 'airline_tabfill':  ['#c8c8c8' , '#2e2e2e' , 188 , 235 , '' ],
+      \ 'airline_tabmod':   ['#2e2e2e' , '#a4c639' , 235 , 149 , '' ],
+      \ }
+
+let s:WI = [ '#ff0000', '#2e2e2e', 196, 235 ]
+let g:airline#themes#raven#palette.normal.airline_warning = [
+     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+     \ ]
+
+let g:airline#themes#raven#palette.normal_modified.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.insert.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.insert_modified.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.visual.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.visual_modified.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.replace.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.replace_modified.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#raven#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#c8c8c8' , '#2e2e2e' , 188 , 235 , ''     ] ,
+      \ [ '#c8c8c8' , '#2e2e2e' , 188 , 235 , ''     ] ,
+      \ [ '#2e2e2e' , '#a4c639' , 235 , 149 , ''     ] )

autoload/airline/themes/serene.vim

@@ -5,20 +5,19 @@ 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 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 = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 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 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)
 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     , ''     ] ,
@@ -29,13 +28,14 @@ let g:airline#themes#serene#palette.replace = {
       \ }
 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 s:V1 = [ '#dfdf00' , s:guibg , 184 , s:termbg ]
+let s:V2 = [ '#ff5f00' , s:guibg , 202 , s:termbg ]
+let s:V3 = [ '#767676' , s:guibg , 7   , s:termbg ]
+let g:airline#themes#serene#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 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 = airline#themes#generate_color_map(s:IA, s:IA2, s:IA2)
 let g:airline#themes#serene#palette.inactive_modified = copy(g:airline#themes#serene#palette.normal_modified)
+

autoload/airline/themes/silver.vim

@@ -0,0 +1,85 @@
+let g:airline#themes#silver#palette = {}
+
+let g:airline#themes#silver#palette.accents = {
+      \ 'red': [ '#ff2121' , '' , 196 , '' , '' ],
+      \ }
+
+let s:N1 = [ '#414141' , '#e1e1e1' , 59 , 188 ]
+let s:N2 = [ '#414141' , '#e1e1e1' , 59 , 188 ]
+let s:N3 = [ '#414141' , '#e1e1e1' , 59 , 188 ]
+let g:airline#themes#silver#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#silver#palette.normal_modified = {
+      \ 'airline_c': [ '#e25000' , '#e1e1e1' , 166 , 188 , '' ] ,
+      \ }
+
+let s:I1 = [ '#0d935c' , '#e1e1e1' , 29 , 188 ]
+let s:I2 = [ '#0d935c' , '#e1e1e1' , 29 , 188 ]
+let s:I3 = [ '#0d935c' , '#e1e1e1' , 29 , 188 ]
+let g:airline#themes#silver#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#silver#palette.insert_modified = {
+      \ 'airline_c': [ '#e25000' , '#e1e1e1' , 166 , 188 , '' ] ,
+      \ }
+let g:airline#themes#silver#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#e1e1e1' , s:I1[2] , 188 , '' ] ,
+      \ }
+
+let g:airline#themes#silver#palette.replace = copy(g:airline#themes#silver#palette.insert)
+let g:airline#themes#silver#palette.replace.airline_a = [ '#b30000' , s:I1[1] , 124 , s:I1[3] , '' ]
+let g:airline#themes#silver#palette.replace.airline_z = [ '#b30000' , s:I1[1] , 124 , s:I1[3] , '' ]
+let g:airline#themes#silver#palette.replace_modified = g:airline#themes#silver#palette.insert_modified
+
+let s:V1 = [ '#0000b3' , '#e1e1e1' , 19 , 188 ]
+let s:V2 = [ '#0000b3' , '#e1e1e1' , 19 , 188 ]
+let s:V3 = [ '#0000b3' , '#e1e1e1' , 19 , 188 ]
+let g:airline#themes#silver#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#silver#palette.visual_modified = {
+      \ 'airline_c': [ '#e25000' , '#e1e1e1' , 166 , 188 , '' ] ,
+      \ }
+
+let s:IA = [ '#a1a1a1' , '#dddddd' , 145 , 188 , '' ]
+let g:airline#themes#silver#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#silver#palette.inactive_modified = {
+      \ 'airline_c': [ '#e25000' , '' , 166 , '' , '' ] ,
+       \ }
+
+let g:airline#themes#silver#palette.tabline = {
+      \ 'airline_tab':      ['#414141' , '#e1e1e1' , 59  , 188 , '' ],
+      \ 'airline_tabsel':   ['#e1e1e1' , '#007599' , 188 , 30  , '' ],
+      \ 'airline_tabtype':  ['#414141' , '#e1e1e1' , 59  , 188 , '' ],
+      \ 'airline_tabfill':  ['#414141' , '#e1e1e1' , 59  , 188 , '' ],
+      \ 'airline_tabmod':   ['#e1e1e1' , '#007599' , 188 , 30  , '' ],
+      \ }
+
+let s:WI = [ '#ff0000', '#e1e1e1', 196, 188 ]
+let g:airline#themes#silver#palette.normal.airline_warning = [
+     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+     \ ]
+
+let g:airline#themes#silver#palette.normal_modified.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.insert.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.insert_modified.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.visual.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.visual_modified.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.replace.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.replace_modified.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#silver#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#414141' , '#e1e1e1' , 59  , 188 , ''     ] ,
+      \ [ '#414141' , '#e1e1e1' , 59  , 188 , ''     ] ,
+      \ [ '#e1e1e1' , '#007599' , 188 , 30  , ''     ] )

autoload/airline/themes/simple.vim

@@ -5,11 +5,10 @@ let s:guibg2 = '#1c1c1c'
 let s:termbg = 232
 let s:termbg2= 234
 
-let s:file = [ '#ff0000' , '' , 160 , '' , '' ]
 let s:N1 = [ s:guibg , '#00dfff' , s:termbg , 45 ]
 let s:N2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
 let s:N3 = [ '#767676' , s:guibg, 243 , s:termbg]
-let g:airline#themes#simple#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#simple#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 let g:airline#themes#simple#palette.normal_modified = {
       \ 'airline_c': [ '#df0000' , s:guibg, 160     , s:termbg    , ''     ] ,
       \ }
@@ -18,7 +17,7 @@ let g:airline#themes#simple#palette.normal_modified = {
 let s:I1 = [ s:guibg, '#5fff00' , s:termbg , 82 ]
 let s:I2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
 let s:I3 = [ '#767676' , s:guibg, 243 , s:termbg ]
-let g:airline#themes#simple#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#simple#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 let g:airline#themes#simple#palette.insert_modified = copy(g:airline#themes#simple#palette.normal_modified)
 let g:airline#themes#simple#palette.insert_paste = {
       \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
@@ -34,13 +33,13 @@ let g:airline#themes#simple#palette.replace_modified = copy(g:airline#themes#sim
 let s:V1 = [ s:guibg, '#dfdf00' , s:termbg , 184 ]
 let s:V2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
 let s:V3 = [ '#767676' , s:guibg, 243 , s:termbg ]
-let g:airline#themes#simple#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#simple#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 let g:airline#themes#simple#palette.visual_modified = copy(g:airline#themes#simple#palette.normal_modified)
 
 
 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 = airline#themes#generate_color_map(s:IA, s:IA2, s:IA2)
 let g:airline#themes#simple#palette.inactive_modified = {
       \ 'airline_c': [ '#df0000', '', 160, '', '' ] ,
       \ }

autoload/airline/themes/sol.vim

@@ -0,0 +1,90 @@
+" vim-airline companion theme of Sol
+" (https://github.com/Pychimp/vim-sol)
+
+let g:airline#themes#sol#palette = {}
+
+let g:airline#themes#sol#palette.accents = {
+      \ 'red': [ '#ffffff' , '' , 231 , '' , '' ],
+      \ }
+
+let s:N1 = [ '#343434' , '#a0a0a0' , 237 , 248 ]
+let s:N2 = [ '#343434' , '#b3b3b3' , 237 , 250 ]
+let s:N3 = [ '#343434' , '#c7c7c7' , 237 , 252 ]
+let g:airline#themes#sol#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#sol#palette.normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#ff6868' , 237 , 209 , '' ] ,
+      \ }
+
+
+let s:I1 = [ '#eeeeee' , '#09643f' , 255 , 30  ]
+let s:I2 = [ '#343434' , '#a3a3a3' , 237 , 249 ]
+let s:I3 = [ '#343434' , '#b0b0b0' , 237 , 250 ]
+let g:airline#themes#sol#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#sol#palette.insert_modified = {
+      \ 'airline_c': [ '#343434' , '#ffdbc7' , 237 , 216 , '' ] ,
+      \ }
+let g:airline#themes#sol#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#09643f' , s:I1[2] , 30 , '' ] ,
+      \ }
+
+
+let g:airline#themes#sol#palette.replace = copy(g:airline#themes#sol#palette.insert)
+let g:airline#themes#sol#palette.replace.airline_a = [ s:I1[0] , '#ff2121' , s:I1[2] , 196 , '' ]
+let g:airline#themes#sol#palette.replace.airline_z = [ s:I1[0] , '#ff2121' , s:I1[2] , 196 , '' ]
+let g:airline#themes#sol#palette.replace_modified = g:airline#themes#sol#palette.insert_modified
+
+let s:V1 = [ '#ffff9a' , '#ff6003' , 222 , 202 ]
+let s:V2 = [ '#343434' , '#a3a3a3' , 237 , 249 ]
+let s:V3 = [ '#343434' , '#b0b0b0' , 237 , 250 ]
+let g:airline#themes#sol#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#sol#palette.visual_modified = {
+      \ 'airline_c': [ '#343434' , '#ffdbc7' , 237 , 216 , '' ] ,
+      \ }
+
+let s:IA = [ '#777777' , '#c7c7c7' , 244 , 251 , '' ]
+let g:airline#themes#sol#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#sol#palette.inactive_modified = {
+      \ 'airline_c': [ '#ff3535' , '' , 203 , '' , '' ] ,
+       \ }
+
+let g:airline#themes#sol#palette.tabline = {
+      \ 'airline_tab':      ['#343434', '#b3b3b3',  237, 250, ''],
+      \ 'airline_tabsel':   ['#ffffff', '#004b9a',  231, 31 , ''],
+      \ 'airline_tabtype':  ['#343434', '#a0a0a0',  237, 248, ''],
+      \ 'airline_tabfill':  ['#343434', '#c7c7c7',  237, 251, ''],
+      \ 'airline_tabmod':   ['#343434', '#ffdbc7',  237, 216, ''],
+      \ }
+
+let s:WI = [ '#eeeeee', '#e33900', 255, 166 ]
+let g:airline#themes#sol#palette.normal.airline_warning = [
+     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+     \ ]
+
+let g:airline#themes#sol#palette.normal_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.insert.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.insert_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.visual.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.visual_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.replace.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.replace_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#sol#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#343434' , '#c7c7c7' , 237 , 251 , ''     ] ,
+      \ [ '#343434' , '#b3b3b3' , 237 , 250 , ''     ] ,
+      \ [ '#eeeeee' , '#007fff' , 255 , 27  , ''     ] )

autoload/airline/themes/solarized.vim

@@ -1,35 +1,33 @@
 let g:airline#themes#solarized#palette = {}
 
-function! s:generate()
+function! airline#themes#solarized#refresh()
   """"""""""""""""""""""""""""""""""""""""""""""""
   " Options
   """"""""""""""""""""""""""""""""""""""""""""""""
-  let s:reduced     = get(g:, 'airline_solarized_reduced', 1)
   let s:background  = get(g:, 'airline_solarized_bg', &background)
   let s:ansi_colors = get(g:, 'solarized_termcolors', 16) != 256 && &t_Co >= 16 ? 1 : 0
+  let s:tty         = &t_Co == 8
 
   """"""""""""""""""""""""""""""""""""""""""""""""
   " Colors
   """"""""""""""""""""""""""""""""""""""""""""""""
   " Base colors
-  let s:base03  = {'t': s:ansi_colors ?   8 : 234, 'g': '#002b36'}
-  let s:base02  = {'t': s:ansi_colors ? '0' : 235, 'g': '#073642'}
-  let s:base01  = {'t': s:ansi_colors ?  10 : 240, 'g': '#586e75'}
-  let s:base00  = {'t': s:ansi_colors ?  11 : 241, 'g': '#657b83'}
-  let s:base0   = {'t': s:ansi_colors ?  12 : 244, 'g': '#839496'}
-  let s:base1   = {'t': s:ansi_colors ?  14 : 245, 'g': '#93a1a1'}
-  let s:base2   = {'t': s:ansi_colors ?   7 : 254, 'g': '#eee8d5'}
-  let s:base3   = {'t': s:ansi_colors ?  15 : 230, 'g': '#fdf6e3'}
-  let s:yellow  = {'t': s:ansi_colors ?   3 : 136, 'g': '#b58900'}
-  let s:orange  = {'t': s:ansi_colors ?   9 : 166, 'g': '#cb4b16'}
-  let s:red     = {'t': s:ansi_colors ?   1 : 160, 'g': '#dc322f'}
-  let s:magenta = {'t': s:ansi_colors ?   5 : 125, 'g': '#d33682'}
-  let s:violet  = {'t': s:ansi_colors ?  13 : 61 , 'g': '#6c71c4'}
-  let s:blue    = {'t': s:ansi_colors ?   4 : 33 , 'g': '#268bd2'}
-  let s:cyan    = {'t': s:ansi_colors ?   6 : 37 , 'g': '#2aa198'}
-  let s:green   = {'t': s:ansi_colors ?   2 : 64 , 'g': '#859900'}
-  let s:color236= {'t': s:ansi_colors ? '0' : 236, 'g': '#303030'}
-  let s:color251= {'t': s:ansi_colors ?  14 : 251, 'g': '#c6c6c6'}
+  let s:base03  = {'t': s:ansi_colors ?   8 : (s:tty ? '0' : 234), 'g': '#002b36'}
+  let s:base02  = {'t': s:ansi_colors ? '0' : (s:tty ? '0' : 235), 'g': '#073642'}
+  let s:base01  = {'t': s:ansi_colors ?  10 : (s:tty ? '0' : 240), 'g': '#586e75'}
+  let s:base00  = {'t': s:ansi_colors ?  11 : (s:tty ? '7' : 241), 'g': '#657b83'}
+  let s:base0   = {'t': s:ansi_colors ?  12 : (s:tty ? '7' : 244), 'g': '#839496'}
+  let s:base1   = {'t': s:ansi_colors ?  14 : (s:tty ? '7' : 245), 'g': '#93a1a1'}
+  let s:base2   = {'t': s:ansi_colors ?   7 : (s:tty ? '7' : 254), 'g': '#eee8d5'}
+  let s:base3   = {'t': s:ansi_colors ?  15 : (s:tty ? '7' : 230), 'g': '#fdf6e3'}
+  let s:yellow  = {'t': s:ansi_colors ?   3 : (s:tty ? '3' : 136), 'g': '#b58900'}
+  let s:orange  = {'t': s:ansi_colors ?   9 : (s:tty ? '1' : 166), 'g': '#cb4b16'}
+  let s:red     = {'t': s:ansi_colors ?   1 : (s:tty ? '1' : 160), 'g': '#dc322f'}
+  let s:magenta = {'t': s:ansi_colors ?   5 : (s:tty ? '5' : 125), 'g': '#d33682'}
+  let s:violet  = {'t': s:ansi_colors ?  13 : (s:tty ? '5' : 61 ), 'g': '#6c71c4'}
+  let s:blue    = {'t': s:ansi_colors ?   4 : (s:tty ? '4' : 33 ), 'g': '#268bd2'}
+  let s:cyan    = {'t': s:ansi_colors ?   6 : (s:tty ? '6' : 37 ), 'g': '#2aa198'}
+  let s:green   = {'t': s:ansi_colors ?   2 : (s:tty ? '2' : 64 ), 'g': '#859900'}
 
   """"""""""""""""""""""""""""""""""""""""""""""""
   " Simple mappings
@@ -37,61 +35,52 @@ function! s:generate()
   " the specific gui and terminal colors from the base color dicts.
   """"""""""""""""""""""""""""""""""""""""""""""""
   " Normal mode
-  let s:N1 = [s:base2, s:blue, 'bold']
   if s:background == 'dark'
-    let s:N2 = [s:base2, s:base01, '']
-    let s:N3 = [s:base1, s:base02, '']
+    let s:N1 = [s:base3, s:base1, 'bold']
+    let s:N2 = [s:base2, (s:tty ? s:base01 : s:base00), '']
+    let s:N3 = [s:base01, s:base02, '']
   else
-    let s:N2 = [s:base2, s:base00, '']
-    let s:N3 = [s:base00, s:base2, '']
+    let s:N1 = [s:base2, s:base00, 'bold']
+    let s:N2 = [(s:tty ? s:base01 : s:base2), s:base1, '']
+    let s:N3 = [s:base1, s:base2, '']
   endif
   let s:NF = [s:orange, s:N3[1], '']
-  let s:NM = [s:orange, s:N3[1], '']
   let s:NW = [s:base3, s:orange, '']
   if s:background == 'dark'
-    let s:NM = [s:orange, s:N3[1], '']
+    let s:NM = [s:base1, s:N3[1], '']
+    let s:NMi = [s:base2, s:N3[1], '']
   else
-    let s:NM = [s:red, s:N3[1], '']
+    let s:NM = [s:base01, s:N3[1], '']
+    let s:NMi = [s:base02, s:N3[1], '']
   endif
 
   " Insert mode
-  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
-      let s:I2 = [s:base00, s:color251, '']
-    endif
-  endif
+  let s:I1 = [s:N1[0], s:yellow, 'bold']
+  let s:I2 = s:N2
   let s:I3 = s:N3
   let s:IF = s:NF
   let s:IM = s:NM
 
   " Visual mode
-  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
+  let s:V1 = [s:N1[0], s:magenta, 'bold']
+  let s:V2 = s:N2
+  let s:V3 = s:N3
   let s:VF = s:NF
-  if s:reduced
-    let s:VM = s:NM
-  else
-    let s:VM = s:IM
-  endif
+  let s:VM = s:NM
 
-  " Inactive
+  " Replace mode
+  let s:R1 = [s:N1[0], s:red, '']
+  let s:R2 = s:N2
+  let s:R3 = s:N3
+  let s:RM = s:NM
+  let s:RF = s:NF
+
+  " Inactive, according to VertSplit in solarized
+  " (bg dark: base00; bg light: base0)
   if s:background == 'dark'
-    let s:IA = [s:base00, s:base02, '']
+    let s:IA = [s:base02, s:base00, '']
   else
-    let s:IA = [s:base1, s:base2, '']
+    let s:IA = [s:base2, s:base0, '']
   endif
 
   """"""""""""""""""""""""""""""""""""""""""""""""
@@ -101,20 +90,23 @@ function! s:generate()
   let s:NFa = [s:NF[0].g, s:NF[1].g, s:NF[0].t, s:NF[1].t, s:NF[2]]
   let s:IFa = [s:IF[0].g, s:IF[1].g, s:IF[0].t, s:IF[1].t, s:IF[2]]
   let s:VFa = [s:VF[0].g, s:VF[1].g, s:VF[0].t, s:VF[1].t, s:VF[2]]
+  let s:RFa = [s:RF[0].g, s:RF[1].g, s:RF[0].t, s:RF[1].t, s:RF[2]]
+
+  let g:airline#themes#solarized#palette.accents = {
+        \ 'red': s:NFa,
+        \ }
 
   let g:airline#themes#solarized#palette.inactive = airline#themes#generate_color_map(
         \ [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:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
-        \ s:NFa)
+        \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]])
   let g:airline#themes#solarized#palette.inactive_modified = {
-        \ 'airline_c': [s:NM[0].g, '', s:NM[0].t, '', s:NM[2]]}
+        \ 'airline_c': [s:NMi[0].g, '', s:NMi[0].t, '', s:NMi[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]],
         \ [s:N2[0].g, s:N2[1].g, s:N2[0].t, s:N2[1].t, s:N2[2]],
-        \ [s:N3[0].g, s:N3[1].g, s:N3[0].t, s:N3[1].t, s:N3[2]],
-        \ s:NFa)
+        \ [s:N3[0].g, s:N3[1].g, s:N3[0].t, s:N3[1].t, s:N3[2]])
 
   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]]
@@ -126,27 +118,51 @@ function! s:generate()
   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]],
-        \ [s:I3[0].g, s:I3[1].g, s:I3[0].t, s:I3[1].t, s:I3[2]],
-        \ s:IFa)
+        \ [s:I3[0].g, s:I3[1].g, s:I3[0].t, s:I3[1].t, s:I3[2]])
+
+  let g:airline#themes#solarized#palette.insert.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
 
   let g:airline#themes#solarized#palette.insert_modified = {
         \ 'airline_c': [s:IM[0].g, s:IM[1].g,
         \ s:IM[0].t, s:IM[1].t, s:IM[2]]}
 
+  let g:airline#themes#solarized#palette.insert_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
   let g:airline#themes#solarized#palette.visual = airline#themes#generate_color_map(
         \ [s:V1[0].g, s:V1[1].g, s:V1[0].t, s:V1[1].t, s:V1[2]],
         \ [s:V2[0].g, s:V2[1].g, s:V2[0].t, s:V2[1].t, s:V2[2]],
-        \ [s:V3[0].g, s:V3[1].g, s:V3[0].t, s:V3[1].t, s:V3[2]],
-        \ s:VFa)
+        \ [s:V3[0].g, s:V3[1].g, s:V3[0].t, s:V3[1].t, s:V3[2]])
+
+  let g:airline#themes#solarized#palette.visual.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
 
   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.visual_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.replace = airline#themes#generate_color_map(
+        \ [s:R1[0].g, s:R1[1].g, s:R1[0].t, s:R1[1].t, s:R1[2]],
+        \ [s:R2[0].g, s:R2[1].g, s:R2[0].t, s:R2[1].t, s:R2[2]],
+        \ [s:R3[0].g, s:R3[1].g, s:R3[0].t, s:R3[1].t, s:R3[2]])
+
+  let g:airline#themes#solarized#palette.replace.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.replace_modified = {
+        \ 'airline_c': [s:RM[0].g, s:RM[1].g,
+        \ s:RM[0].t, s:RM[1].t, s:RM[2]]}
+
+  let g:airline#themes#solarized#palette.replace_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
   let g:airline#themes#solarized#palette.tabline = {}
 
   let g:airline#themes#solarized#palette.tabline.airline_tab = [
@@ -156,8 +172,5 @@ function! s:generate()
         \ s:N2[0].g, s:N2[1].g, s:N2[0].t, s:N2[1].t, s:N2[2]]
 endfunction
 
-call s:generate()
-augroup airline_solarized
-  autocmd!
-  autocmd ColorScheme * call <sid>generate() | call airline#load_theme()
-augroup END
+call airline#themes#solarized#refresh()
+

autoload/airline/themes/tomorrow.vim

@@ -1,12 +1,14 @@
 let g:airline#themes#tomorrow#palette = {}
 
-function! s:generate()
-  let s:file = airline#themes#get_highlight('Constant')
+function! airline#themes#tomorrow#refresh()
+  let g:airline#themes#tomorrow#palette.accents = {
+        \ 'red': airline#themes#get_highlight('Constant'),
+        \ }
 
   let s:N1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Directory', 'fg'], 'bold')
   let s:N2 = airline#themes#get_highlight('Pmenu')
   let s:N3 = airline#themes#get_highlight('CursorLine')
-  let g:airline#themes#tomorrow#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+  let g:airline#themes#tomorrow#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
   let group = airline#themes#get_highlight('vimCommand')
   let g:airline#themes#tomorrow#palette.normal_modified = {
@@ -16,30 +18,27 @@ function! s:generate()
   let s:I1 = airline#themes#get_highlight2(['Normal', 'bg'], ['MoreMsg', 'fg'], 'bold')
   let s:I2 = airline#themes#get_highlight2(['MoreMsg', 'fg'], ['Normal', 'bg'])
   let s:I3 = s:N3
-  let g:airline#themes#tomorrow#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+  let g:airline#themes#tomorrow#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
   let g:airline#themes#tomorrow#palette.insert_modified = g:airline#themes#tomorrow#palette.normal_modified
 
   let s:R1 = airline#themes#get_highlight('Error', 'bold')
   let s:R2 = s:N2
   let s:R3 = s:N3
-  let g:airline#themes#tomorrow#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
+  let g:airline#themes#tomorrow#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
   let g:airline#themes#tomorrow#palette.replace_modified = g:airline#themes#tomorrow#palette.normal_modified
 
   let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Constant', 'fg'], 'bold')
   let s:V2 = airline#themes#get_highlight2(['Constant', 'fg'], ['Normal', 'bg'])
   let s:V3 = s:N3
-  let g:airline#themes#tomorrow#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+  let g:airline#themes#tomorrow#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
   let g:airline#themes#tomorrow#palette.visual_modified = g:airline#themes#tomorrow#palette.normal_modified
 
   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 = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
   let g:airline#themes#tomorrow#palette.inactive_modified = {
         \ 'airline_c': [ group[0], '', group[2], '', '' ]
         \ }
 endfunction
 
-call s:generate()
-augroup airline_tomorrow
-  autocmd!
-  autocmd ColorScheme * call <sid>generate() | call airline#load_theme()
-augroup END
+call airline#themes#tomorrow#refresh()
+

autoload/airline/themes/ubaryd.vim

@@ -24,21 +24,25 @@ let s:RE = [ '#c7915b' , 173 ] " nut
 " Paste mode
 let s:PA = [ '#f9ef6d' , 154 ] " bleaklemon
 
-let s:file = [ '#ff7400' , '' , 196 , '' , '' ]
 let s:IA = [ s:N2[1], s:N3[1], s:N2[3], s:N3[3], '' ]	
 
 let g:airline#themes#ubaryd#palette = {}
+
+let g:airline#themes#ubaryd#palette.accents = {
+      \ 'red': [ '#ff7400' , '' , 196 , '' , '' ],
+      \ }
+
 let g:airline#themes#ubaryd#palette.inactive = {
       \ 'airline_a' : [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ] }
 
 
-let g:airline#themes#ubaryd#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#ubaryd#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 let g:airline#themes#ubaryd#palette.normal_modified = {
       \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
       \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
 
 
-let g:airline#themes#ubaryd#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#ubaryd#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 let g:airline#themes#ubaryd#palette.insert_modified = {
       \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
 let g:airline#themes#ubaryd#palette.insert_paste = {
@@ -50,11 +54,11 @@ let g:airline#themes#ubaryd#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:
 let g:airline#themes#ubaryd#palette.replace_modified = g:airline#themes#ubaryd#palette.insert_modified
 
 
-let g:airline#themes#ubaryd#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#ubaryd#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 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 = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
 let g:airline#themes#ubaryd#palette.inactive_modified = {
       \ 'airline_c' : [ s:V1[1] , ''      , s:V1[3] , ''      , '' ] }
 

autoload/airline/themes/understated.vim

@@ -0,0 +1,43 @@
+let g:airline#themes#understated#palette = {}
+
+let s:N1 = ['#FFFFFF', '#5F87FF', 15, 69]  " Outside blocks in normal mode (mode and file position)
+let s:N2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format)
+let s:N3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block
+
+let g:airline#themes#understated#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#understated#palette.normal_modified = {'airline_c': ['#ffffff', '#5f005f', 144, 59, 'bold'] ,}
+
+let s:I1 = ['#FFFFFF', '#87AF5F', 15, 107] " Outside blocks in normal mode (mode and file position)
+let s:I2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format)
+let s:I3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block
+let g:airline#themes#understated#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#understated#palette.insert_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,}
+let g:airline#themes#understated#palette.insert_paste = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, ''] ,}
+
+let g:airline#themes#understated#palette.replace = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#understated#palette.replace.airline_a = ['#FFFFFF', '#870000', 15, 88, '']
+let g:airline#themes#understated#palette.replace_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,}
+
+let s:V1 = ['#FFFFFF', '#AF5F00', 15, 130]
+let s:V2 = ['#AFAF87', '#5F5F5F', 144, 59]
+let s:V3 = ['#AFAF87', '#5F5F5F', 144, 59]
+let g:airline#themes#understated#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#understated#palette.visual_modified = {'airline_c': [ '#AFAF87', '#5f005f', 144, 59, 'bold'] ,}
+
+let s:V1 = ['#080808', '#FFAF00', 232, 214]
+let s:IA1 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let s:IA2 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let s:IA3 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let g:airline#themes#understated#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#understated#palette.inactive_modified = {'airline_c': ['#4E4E4E', '', 239, '', 'bold'] ,}
+
+let g:airline#themes#understated#palette.accents = {'red': ['#FF0000', '', 88, '']}
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#understated#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ ['#FFFFFF', '#1C1C1C', 15, 234, '' ],
+      \ ['#FFFFFF', '#262626', 15, 235, '' ],
+      \ ['#FFFFFF', '#303030', 15, 236, 'bold'])
+

autoload/airline/themes/wombat.vim

@@ -32,38 +32,37 @@ let s:PA = [ '#94E42C' , 47 ]
 " Info modified
 let s:IM = [ '#40403C' , 238 ]
 
-" File permissions (RO, etc)
-let s:file = [ '#E5786D' , '' , 203 , '' , '' ]
-
 " Inactive mode
 let s:IA = [ '#767676' , s:N3[1] , 243 , s:N3[3] , '' ]
 
-
 let g:airline#themes#wombat#palette = {}
 
+let g:airline#themes#wombat#palette.accents = {
+      \ 'red': [ '#E5786D' , '' , 203 , '' , '' ],
+      \ }
 
-let g:airline#themes#wombat#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3, s:file)
+let g:airline#themes#wombat#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 let g:airline#themes#wombat#palette.normal_modified = {
     \ 'airline_a': [ s:N1[0] , s:N4[0] , s:N1[2] , s:N4[1] , ''     ] ,
     \ 'airline_b': [ s:N4[0] , s:IM[0] , s:N4[1] , s:IM[1] , ''     ] ,
     \ 'airline_c': [ s:N4[0] , s:N3[1] , s:N4[1] , s:N3[3] , ''     ] }
 
 
-let g:airline#themes#wombat#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3, s:file)
+let g:airline#themes#wombat#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
 let g:airline#themes#wombat#palette.insert_modified = {
     \ 'airline_a': [ s:I1[0] , s:I4[0] , s:I1[2] , s:I4[1] , ''     ] ,
     \ 'airline_b': [ s:I4[0] , s:IM[0] , s:I4[1] , s:IM[1] , ''     ] ,
     \ 'airline_c': [ s:I4[0] , s:N3[1] , s:I4[1] , s:N3[3] , ''     ] }
 
 
-let g:airline#themes#wombat#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3, s:file)
+let g:airline#themes#wombat#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
 let g:airline#themes#wombat#palette.visual_modified = {
     \ 'airline_a': [ s:V1[0] , s:V4[0] , s:V1[2] , s:V4[1] , ''     ] ,
     \ 'airline_b': [ s:V4[0] , s:IM[0] , s:V4[1] , s:IM[1] , ''     ] ,
     \ 'airline_c': [ s:V4[0] , s:N3[1] , s:V4[1] , s:N3[3] , ''     ] }
 
 
-let g:airline#themes#wombat#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3, s:file)
+let g:airline#themes#wombat#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
 let g:airline#themes#wombat#palette.replace_modified = {
     \ 'airline_a': [ s:R1[0] , s:R4[0] , s:R1[2] , s:R4[1] , ''     ] ,
     \ 'airline_b': [ s:R4[0] , s:IM[0] , s:R4[1] , s:IM[1] , ''     ] ,
@@ -76,7 +75,7 @@ let g:airline#themes#wombat#palette.insert_paste = {
     \ 'airline_c': [ s:PA[0] , s:N3[1] , s:PA[1] , s:N3[3] , ''     ] }
 
 
-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 = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
 let g:airline#themes#wombat#palette.inactive_modified = {
     \ 'airline_c': [ s:N4[0] , ''      , s:N4[1] , ''      , ''     ] }
 

autoload/airline/themes/zenburn.vim

@@ -1,12 +1,15 @@
 let g:airline#themes#zenburn#palette = {}
 
-function! s:generate()
+function! airline#themes#zenburn#refresh()
+  let g:airline#themes#zenburn#palette.accents = {
+        \ 'red': airline#themes#get_highlight('Constant'),
+        \ }
+
   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 g:airline#themes#zenburn#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
   let s:Nmod = airline#themes#get_highlight('Comment')
   let g:airline#themes#zenburn#palette.normal_modified = {
         \ 'airline_c': s:Nmod
@@ -15,31 +18,27 @@ function! s:generate()
   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 = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
   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 = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
   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 = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
   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 = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
   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
+call airline#themes#zenburn#refresh()
 

autoload/airline/util.vim

@@ -1,7 +1,8 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 call airline#init#bootstrap()
+let s:spc = g:airline_symbols.space
 
 function! airline#util#wrap(text, minwidth)
   if a:minwidth > 0 && winwidth(0) < a:minwidth
@@ -14,14 +15,15 @@ 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
+  let prefix = s:spc == "\ua0" ? s:spc : s:spc.s:spc
+  return empty(a:text) ? '' : prefix.g:airline_left_alt_sep.s:spc.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.' '
+  return empty(a:text) ? '' : a:text.s:spc.g:airline_right_alt_sep.s:spc
 endfunction
 
 if v:version >= 704

doc/airline.txt

@@ -1,4 +1,5 @@
 *airline.txt*  Lean and mean status/tabline that's light as air
+*airline*
                    _                       _      _ _                        ~
             __   _(_)_ __ ___         __ _(_)_ __| (_)_ __   ___             ~
             \ \ / / | '_ ` _ \ _____ / _` | | '__| | | '_ \ / _ \            ~
@@ -6,7 +7,26 @@
               \_/ |_|_| |_| |_|      \__,_|_|_|  |_|_|_| |_|\___|            ~
                                                                              ~
 ==============================================================================
-INTRODUCTION                                                       *airline*
+CONTENTS                                                  *airline-contents*
+
+   01. Intro ............................................... |airline-intro|
+   02. Features ......................................... |airline-features|
+   03. Name ................................................. |airline-name|
+   04. Configuration ............................... |airline-configuration|
+   05. Commands ......................................... |airline-commands|
+   06. Customization ............................... |airline-customization|
+   07. Extensions ..................................... |airline-extensions|
+   08. Advanced Customization ............. |airline-advanced-customization|
+   09. Funcrefs ......................................... |airline-funcrefs|
+   10. Pipeline ......................................... |airline-pipeline|
+   11. Writing Extensions ..................... |airline-writing-extensions|
+   12. Writing Themes ..................................... |airline-themes|
+   13. Troubleshooting ........................... |airline-troubleshooting|
+   14. Contributions ............................... |airline-contributions|
+   15. License ........................................... |airline-license|
+
+==============================================================================
+INTRODUCTION                                                 *airline-intro*
 
 vim-airline is a fast and lightweight alternative to powerline, written
 in 100% vimscript with no outside dependencies.
@@ -19,7 +39,7 @@ FEATURES                                                  *airline-features*
 *  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.
-*  fully customizable; if you know a little |statusline| syntax you can
+*  fully customizable; if you know a little 'statusline' syntax you can
    tweak it to your needs.
 *  extremely easy to write themes.
 
@@ -72,7 +92,7 @@ values):
   endfunction
 <
 * enable/disable automatic population of the `g:airline_symbols` dictionary
-  with powerline symbols.
+  with powerline symbols. >
   let g:airline_powerline_fonts=0
 <
 * define the set of text to display for each mode.  >
@@ -106,6 +126,11 @@ values):
   heavily) >
   let g:airline_exclude_preview = 0
 <
+* disable the Airline customization for selective windows (this is a
+  window-local variable so you can disable it for only some windows) >
+  let w:airline_disabled = 1
+<
+
 ==============================================================================
 COMMANDS                                                  *airline-commands*
 
@@ -116,7 +141,10 @@ COMMANDS                                                  *airline-commands*
   Toggles whitespace detection.
 
 :AirlineToggle                                              *:AirlineToggle*
-  Toggles between the standard `statusline`
+  Toggles between the standard 'statusline' and airline.
+
+:AirlineRefresh                                            *:AirlineRefresh*
+  Refreshes all highlight groups and redraws the statusline.
 
 ==============================================================================
 CUSTOMIZATION                                        *airline-customization*
@@ -124,9 +152,13 @@ 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 = {}
->
+Note: You must define the dictionary first before setting values. Also, it's a
+good idea to check whether if it exists as to avoid accidentally overwritting
+its contents. >
+  if !exists('g:airline_symbols')
+    let g:airline_symbols = {}
+  endif
+
   " unicode symbols
   let g:airline_left_sep = '»'
   let g:airline_left_sep = '▶'
@@ -165,7 +197,7 @@ with the usual statusline syntax.
 
 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|
+using variables defined in the |airline-configuration| or |airline-extensions|
 section.
 >
   variable names                default contents
@@ -190,6 +222,14 @@ EXTENSIONS                                              *airline-extensions*
 Most extensions are enabled by default and lazily loaded when the
 corresponding plugin (if any) is detected.
 
+By default, airline will attempt to load any extension it can find in the
+'runtimepath'.  On some systems this can result in an undersirable startup
+cost.  You can disable the check with the following flag. >
+  let g:airline#extensions#disable_rtp_load = 1
+<
+  Note: Third party plugins that rely on this behavior will be affected. You
+  will need to manually load them.
+
 -------------------------------------                      *airline-default*
 The default extension understands all of the `g:` variables in the
 |airline-configuration| section, however it also has some more fine-tuned
@@ -197,15 +237,34 @@ 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,
+      \ 'b': 79,
       \ 'x': 60,
       \ 'y': 88,
       \ 'z': 45,
-      \ })
+      \ }
 
   " Note: set to an empty dictionary to disable truncation.
   let g:airline#extensions#default#section_truncate_width = {}
 <
+* configure the layout of the sections by specificing an array of two arrays
+  (first array is the left side, second array is the right side). >
+  let g:airline#extensions#default#layout = [
+      \ [ 'a', 'b', 'c' ],
+      \ [ 'x', 'y', 'z', 'warning' ]
+      \ ]
+<
+-------------------------------------                     *airline-quickfix*
+The quickfix extension is a simple built-in extension which determines
+whether the buffer is a quickfix or location list buffer, and adjusts the
+title accordingly.
+
+* configure the title text for quickfix buffers >
+  let g:airline#extensions#quickfix#quickfix_text = 'Quickfix'
+<
+* configure the title text for location list buffers >
+  let g:airline#extensions#quickfix#location_text = 'Location'
+<
+
 -------------------------------------                   *airline-bufferline*
 vim-bufferline <https://github.com/bling/vim-bufferline>
 
@@ -218,13 +277,20 @@ vim-bufferline <https://github.com/bling/vim-bufferline>
 -------------------------------------                       *airline-branch*
 fugitive.vim <https://github.com/tpope/vim-fugitive>
 lawrencium   <https://bitbucket.org/ludovicchabant/vim-lawrencium>
+vcscommand   <http://www.vim.org/scripts/script.php?script_id=90>
 
 * enable/disable fugitive/lawrencium integration >
   let g:airline#extensions#branch#enabled = 1
 <
 * change the text for when no branch is detected >
   let g:airline#extensions#branch#empty_message = ''
-<
+
+* use vcscommand.vim if available >
+  let g:airline#extensions#branch#use_vcscommand = 0
+
+* truncate long branch names to a fixed length >
+  let g:airline#extensions#branch#displayed_head_limit = 10
+
 -------------------------------------                    *airline-syntastic*
 syntastic <https://github.com/scrooloose/syntastic>
 
@@ -232,13 +298,13 @@ syntastic <https://github.com/scrooloose/syntastic>
   let g:airline#extensions#syntastic#enabled = 1
 <
 -------------------------------------                       *airline-tagbar*
-tagbar <https://github.com/majutsushi/>
+tagbar <https://github.com/majutsushi/tagbar>
 
 * enable/disable tagbar integration >
   let g:airline#extensions#tagbar#enabled = 1
 <
 * change how tags are displayed (:help tagbar-statusline) >
-  let g:airline#extensions#tagbar#flags = ''  "default
+  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'
@@ -256,6 +322,7 @@ csv.vim <https://github.com/chrisbra/csv.vim>
 -------------------------------------                        *airline-hunks*
 vim-gitgutter <https://github.com/airblade/vim-gitgutter>
 vim-signify <https://github.com/mhinz/vim-signify>
+changesPlugin <https://github.com/chrisbra/changesPlugin>
 
 * enable/disable showing a summary of changed hunks under source control. >
   let g:airline#extensions#hunks#enabled = 1
@@ -276,22 +343,45 @@ ctrlp <https://github.com/kien/ctrlp.vim>
   let g:airline#extensions#ctrlp#color_template = 'visual'
   let g:airline#extensions#ctrlp#color_template = 'replace'
 <
+
+* configure whether to show the previous and next modes (mru, buffer, etc...)
+>
+ let g:airline#extensions#ctrlp#show_adjacent_modes = 1
+<
 -------------------------------------                   *airline-virtualenv*
 virtualenv <https://github.com/jmcantrell/vim-virtualenv>
 
 * enable/disable virtualenv integration >
   let g:airline#extensions#virtualenv#enabled = 1
 <
+-------------------------------------                        *airline-eclim*
+eclim <https://eclim.org>
+
+* enable/disable eclim integration, which works well with the
+  |airline-syntastic| extension. >
+  let g:airline#extensions#eclim#enabled = 1
+
 -------------------------------------                   *airline-whitespace*
 * enable/disable detection of whitespace errors. >
   let g:airline#extensions#whitespace#enabled = 1
 <
+* customize the type of mixed indent checking to perform. >
+  " must be all spaces or all tabs before the first non-whitespace character
+  let g:airline#extensions#whitespace#mixed_indent_algo = 0 (default)
+
+  " certain number of spaces are allowed after tabs, but not in between
+  " this algorithm works well for /** */ style comments in a tab-indented file
+  let g:airline#extensions#whitespace#mixed_indent_algo = 1
+<
 * customize the whitespace symbol. >
   let g:airline#extensions#whitespace#symbol = '!'
 <
 * configure which whitespace checks to enable. >
   let g:airline#extensions#whitespace#checks = [ 'indent', 'trailing' ]
 <
+* configure the maximum number of lines where whitespace checking is enabled. >
+  let g:airline#extensions#whitespace#max_lines = 20000
+<
 * configure whether a message should be displayed. >
   let g:airline#extensions#whitespace#show_message = 1
 <
@@ -306,6 +396,9 @@ virtualenv <https://github.com/jmcantrell/vim-virtualenv>
 * enable/disable displaying buffers with a single tab. >
   let g:airline#extensions#tabline#show_buffers = 1
 <
+* enable/disable displaying tabs, regardless of number. >
+  let g:airline#extensions#tabline#show_tabs = 1
+<
 * configure filename match rules to exclude from the tabline. >
   let g:airline#extensions#tabline#excludes = []
 <
@@ -313,11 +406,36 @@ virtualenv <https://github.com/jmcantrell/vim-virtualenv>
   let g:airline#extensions#tabline#tab_nr_type = 0 " # of splits (default)
   let g:airline#extensions#tabline#tab_nr_type = 1 " tab number
 <
+* enable/disable displaying tab number in tabs mode. >
+  let g:airline#extensions#tabline#show_tab_nr = 1
+
+* enable/disable displaying tab type (far right)
+  let g:airline#extensions#tabline#show_tab_type = 1
+
+* enable/disable displaying index of the buffer.
+
+When enabled, numbers will be displayed in the tabline and mappings will be
+exposed to allow you to select a buffer directly.  Up to 9 mappings will be
+exposed.
+
+  let g:airline#extensions#tabline#buffer_idx_mode = 1
+  nmap <leader>1 <Plug>AirlineSelectTab1
+  nmap <leader>2 <Plug>AirlineSelectTab2
+  nmap <leader>3 <Plug>AirlineSelectTab3
+  nmap <leader>4 <Plug>AirlineSelectTab4
+  nmap <leader>5 <Plug>AirlineSelectTab5
+  nmap <leader>6 <Plug>AirlineSelectTab6
+  nmap <leader>7 <Plug>AirlineSelectTab7
+  nmap <leader>8 <Plug>AirlineSelectTab8
+  nmap <leader>9 <Plug>AirlineSelectTab9
+
+  Note: Mappings will be ignored within a NERDTree buffer.
+
 * defines the name of a formatter for how buffer names are displayed. >
   let g:airline#extensions#tabline#formatter = 'default'
 
   " here is how you can define a 'foo' formatter:
-  function! airline#extensions#tabline#formatters#foo(bufnr, buffers)
+  function! airline#extensions#tabline#foo#format(bufnr, buffers)
     return fnamemodify(bufname(a:bufnr), ':t')
   endfunction
   let g:airline#extensions#tabline#formatter = 'foo'
@@ -335,20 +453,100 @@ virtualenv <https://github.com/jmcantrell/vim-virtualenv>
 <
     * configure collapsing parent directories in buffer name. >
       let g:airline#extensions#tabline#fnamecollapse = 1
+
+  " The `unique_tail` algorithm will display the tail of the filename, unless
+  " there is another file of the same name, in which it will display it along
+  " with the containing parent directory.
+  let g:airline#extensions#tabline#formatter = 'unique_tail'
+
+  " The `unique_tail_improved` - another algorithm, that will smartly uniquify
+  " buffers names with similar filename, suppressing common parts of paths.
+  let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
 <
 * 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.
+  Note: this setting only applies to a single tab and when `show_buffers` is
+  true.
+
+* configure the minimum number of tabs needed to show the tabline. >
+  let g:airline#extensions#tabline#tab_min_count = 0
+<
+  Note: this setting only applies when `show_buffers` is false.
 
 * 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|.
 
+* configure whether close button should be shown
+  let g:airline#extensions#tabline#show_close_button = 1
+
+* configure symbol used to represent close button
+  let g:airline#extensions#tabline#close_symbol = 'X'
+
+<
+Note: Enabling this extension will modify 'showtabline' and 'guioptions'.
+
+-------------------------------------                     *airline-tmuxline*
+tmuxline <https://github.com/edkolev/tmuxline.vim>
+
+* enable/disable tmuxline integration >
+  let g:airline#extensions#tmuxline#enabled = 0
+<
+* configure which mode colors should be used in tmux statusline >
+  let airline#extensions#tmuxline#color_template = 'normal' (default)
+  let airline#extensions#tmuxline#color_template = 'insert'
+  let airline#extensions#tmuxline#color_template = 'visual'
+  let airline#extensions#tmuxline#color_template = 'replace'
+<
+* if specified, setting this option will trigger writing to the file whenever the
+  airline theme is applied, i.e. when :AirlineTheme is executed and on vim
+  startup >
+  airline#extensions#tmuxline#snapshot_file = "~/.tmux-statusline-colors.conf"
+<
+-------------------------------------                   *airline-promptline*
+promptline <https://github.com/edkolev/promptline.vim>
+
+* configure the path to the snapshot .sh file. Mandatory option. The created
+  file should be sourced by the shell on login >
+  " in .vimrc
+  airline#extensions#promptline#snapshot_file = "~/.shell_prompt.sh"
+
+  " in .bashrc/.zshrc
+  [ -f ~/.shell_prompt.sh ] && source ~/.shell_prompt.sh
+<
+* enable/disable promptline integration >
+  let g:airline#extensions#promptline#enabled = 0
+<
+* configure which mode colors should be used in prompt >
+  let airline#extensions#promptline#color_template = 'normal' (default)
+  let airline#extensions#promptline#color_template = 'insert'
+  let airline#extensions#promptline#color_template = 'visual'
+  let airline#extensions#promptline#color_template = 'replace'
+<
+-------------------------------------                    *airline-nrrwrgn*
+NrrwRgn <https://github.com/chrisbra/NrrwRgn>
+
+* enable/disable NrrwRgn integration >
+  let g:airline#extensions#nrrwrgn#enabled = 1
+
+-------------------------------------                        *airline-capslock*
+vim-capslock <https://github.com/tpope/vim-capslock>
+
+* enable/disable vim-capslock integration >
+  let g:airline#extensions#capslock#enabled = 1
+
+-------------------------------------                       *airline-windowswap*
+vim-windowswap <https://github.com/wesQ3/vim-windowswap>
+
+* enable/disable vim-windowswap integration >
+  let g:airline#extensions#windowswap#enabled = 1
+
+* set marked window indicator string >
+  let g:airline#extensions#windowswap#indicator_text = 'WS'
+<
 ==============================================================================
 ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
 
@@ -378,6 +576,37 @@ same `foo` part.
 
 Note: Look at the source code and tests for the full API.
 
+-------------------------------------             *airline-predefined-parts*
+Before is a list of parts that are predefined by vim-airline.
+
+* `mode`           displays the current mode
+* `iminsert`       displays the current insert method
+* `paste`          displays the paste indicator
+* `filetype`       displays the file type
+* `readonly`       displays the read only indicator
+* `file`           displays the filename and modified indicator
+* `ffenc`          displays the file format and encoding
+
+And the following are defined for their respective extensions:
+
+`hunks`, `branch`, `tagbar`, `syntastic`, `whitespace`
+
+-------------------------------------                      *airline-accents*
+Accents can be defined on any part, like so: >
+  call airline#parts#define_accent('foo', 'red')
+<
+This will override the colors of that part by using what is defined in that
+particular accent. In the above example, the `red` accent is used, which means
+regardless of which section the part is used in, it will have red foreground
+colors instead of the section's default foreground color.
+
+The following accents are defined by default. Themes can define their variants
+of the colors, but defaults will be provided if missing. >
+  bold, italic, red, green, blue, yellow, orange, purple
+<
+The defaults configure the mode and line number parts to be bold, and the
+readonly part to be red.
+
 -------------------------------------                     *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
@@ -396,13 +625,13 @@ 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
+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
+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.
 
@@ -463,7 +692,7 @@ to your liking.  Here is an example: >
     return 1
   endfunction
 <
-The above example uses various some example highlight groups to demonstrate
+The above example uses various 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`.
@@ -492,15 +721,15 @@ WRITING EXTENSIONS                              *airline-writing-extensions*
 
 For contributions into the plugin, here are the following guidelines:
 
-1.  For simple |&filetype| checks, they can be added directly into the
+1.  For simple 'filetype' checks, they can be added directly into the
 `extensions.vim` file.
 
 2.  Pretty much everything else should live as a separate file under the
 `extensions/` directory.
 
   a.  Inside `extensions.vim`, add a check for some variable or command that
-      is always available (these must be defined in `plugin`, and _not_
-      `autoload` of the other plugin).  If it exists, then initialize the
+      is always available (these must be defined in `plugin/`, and _not_
+      `autoload/` of the other plugin).  If it exists, then initialize the
       extension. This ensures that the extension is loaded if and only if the
       user has the other plugin installed.  Also, a check to
       `airline#extensions#foo_plugin#enabled` should be performed to allow the
@@ -535,7 +764,7 @@ A. You need to set up your terminal correctly.  For more details, see
   set t_Co=256
 <
 Q. The statusline does not appear until I create a split.
-A. This is the default setting of |laststatus|.  If you want it to appear all
+A. This is the default setting of 'laststatus'.  If you want it to appear all
    the time, add the following to your vimrc: >
   set laststatus=2
 <
@@ -566,7 +795,7 @@ Contributions and pull requests are welcome.
 ==============================================================================
 LICENSE                                                    *airline-license*
 
-MIT License.  Copyright © 2013 Bailey Ling.
+MIT License.  Copyright © 2013-2015 Bailey Ling.
 
 
  vim:tw=78:ts=8:ft=help:norl:

plugin/airline.vim

@@ -1,4 +1,4 @@
-" MIT License. Copyright (c) 2013 Bailey Ling.
+" MIT License. Copyright (c) 2013-2015 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
 if &cp || v:version < 702 || (exists('g:loaded_airline') && g:loaded_airline)
@@ -6,7 +6,7 @@ if &cp || v:version < 702 || (exists('g:loaded_airline') && g:loaded_airline)
 endif
 let g:loaded_airline = 1
 
-" autocmd VimEnter * call airline#deprecation#check()
+autocmd VimEnter * call airline#deprecation#check()
 
 let s:airline_initialized = 0
 let s:airline_theme_defined = 0
@@ -60,8 +60,10 @@ function! s:airline_toggle()
     if exists("s:stl")
       let &stl = s:stl
     endif
+
+    silent doautocmd User AirlineToggledOff
   else
-    let s:stl = &stl
+    let s:stl = &statusline
     augroup airline
       autocmd!
 
@@ -78,6 +80,9 @@ function! s:airline_toggle()
             \ exec 'source '.split(globpath(&rtp, 'autoload/airline/themes/'.g:airline_theme.'.vim', 1), "\n")[0]
             \ | call airline#load_theme()
     augroup END
+
+    silent doautocmd User AirlineToggledOn
+
     if s:airline_initialized
       call <sid>on_window_changed()
     endif
@@ -98,6 +103,7 @@ endfunction
 command! -nargs=? -complete=customlist,<sid>get_airline_themes AirlineTheme call <sid>airline_theme(<f-args>)
 command! AirlineToggleWhitespace call airline#extensions#whitespace#toggle()
 command! AirlineToggle call <sid>airline_toggle()
+command! AirlineRefresh call airline#load_theme() | call airline#update_statusline()
 
 call <sid>airline_toggle()
 

t/airline.vim

@@ -49,7 +49,7 @@ describe 'airline'
   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)}'
+    Expect airline#statusline(1) =~ '%{airline#util#wrap(airline#parts#mode(),0)}%#airline_a#%#airline_a_bold#%{airline#util#wrap(airline#parts#mode(),0)}%#airline_a#'
   end
 
   it 'should remove funcrefs properly'

t/builder.vim

@@ -1,3 +1,4 @@
+let g:airline_theme = 'dark'
 call airline#init#bootstrap()
 
 describe 'active builder'
@@ -12,9 +13,27 @@ describe 'active builder'
 
   it 'should transition colors from one to the next'
     call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('NonText', 'world')
+    call s:builder.add_section('Search', 'world')
     let stl = s:builder.build()
-    Expect stl =~ '%#Normal#hello%#Normal_to_NonText#>%#NonText#world'
+    Expect stl =~ '%#Normal#hello%#Normal_to_Search#>%#Search#world'
+  end
+
+  it 'should reuse highlight group if background colors match'
+    highlight Foo1 ctermfg=1 ctermbg=2
+    highlight Foo2 ctermfg=1 ctermbg=2
+    call s:builder.add_section('Foo1', 'hello')
+    call s:builder.add_section('Foo2', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Foo1#hello>world'
+  end
+
+  it 'should switch highlight groups if foreground colors differ'
+    highlight Foo1 ctermfg=1 ctermbg=2
+    highlight Foo2 ctermfg=2 ctermbg=2
+    call s:builder.add_section('Foo1', 'hello')
+    call s:builder.add_section('Foo2', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Foo1#hello%#Foo1_to_Foo2#>%#Foo2#world'
   end
 
   it 'should split left/right sections'
@@ -26,9 +45,9 @@ describe 'active builder'
   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')
+    call s:builder.add_section('Search', 'world')
     let stl = s:builder.build()
-    Expect stl =~ '%#Normal#hello%#Normal_to_NonText#<%#NonText#world'
+    Expect stl =~ 'hello%#Normal_to_Search#<%#Search#world'
   end
 
   it 'should not repeat the same highlight group'
@@ -37,6 +56,33 @@ describe 'active builder'
     let stl = s:builder.build()
     Expect stl == '%#Normal#hello>hello'
   end
+
+  it 'should replace accent groups with the specified group'
+    call s:builder.add_section('Normal', '%#__accent_foo#hello')
+    let stl = s:builder.build()
+    Expect stl == '%#Normal#%#Normal_foo#hello'
+  end
+
+  it 'should replace two accent groups with correct groups'
+    call s:builder.add_section('Normal', '%#__accent_foo#hello%#__accent_bar#world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Normal_foo#hello%#Normal_bar#world'
+  end
+
+  it 'should special restore group should go back to previous group'
+    call s:builder.add_section('Normal', '%#__restore__#')
+    let stl = s:builder.build()
+    Expect stl !~ '%#__restore__#'
+    Expect stl =~ '%#Normal#'
+  end
+
+  it 'should blend colors from the left through the split to the right'
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.split()
+    call s:builder.add_section('Search', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ 'Normal_to_Search'
+  end
 end
 
 describe 'inactive builder'
@@ -46,9 +92,15 @@ describe 'inactive builder'
 
   it 'should transition colors from one to the next'
     call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('NonText', 'world')
+    call s:builder.add_section('Search', 'world')
     let stl = s:builder.build()
-    Expect stl =~ '%#Normal_inactive#hello%#Normal_to_NonText_inactive#>%#NonText_inactive#world'
+    Expect stl =~ '%#Normal_inactive#hello%#Normal_to_Search_inactive#>%#Search_inactive#world'
+  end
+
+  it 'should not render accents'
+    call s:builder.add_section('Normal', '%#__accent_foo#hello%#foo#foo%#__accent_bar#world')
+    let stl = s:builder.build()
+    Expect stl == '%#Normal_inactive#hello%#foo_inactive#fooworld'
   end
 end
 

t/commands.vim

@@ -25,5 +25,9 @@ describe 'commands'
     execute 'AirlineTheme dark'
     Expect g:airline_theme == 'dark'
   end
+
+  it 'should have a refresh command'
+    Expect exists(':AirlineRefresh') to_be_true
+  end
 end
 

t/extensions_default.vim

@@ -1,6 +1,8 @@
+let g:airline_theme = 'dark'
 call airline#init#bootstrap()
 call airline#init#sections()
 source plugin/airline.vim
+call airline#load_theme()
 
 describe 'default'
   before

t/highligher.vim

@@ -1,10 +0,0 @@
-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/highlighter.vim

@@ -0,0 +1,21 @@
+let g:airline_theme = 'dark'
+
+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
+
+  it 'should populate accent colors'
+    Expect exists('g:airline#themes#dark#palette.normal.airline_c_red') to_be_false
+    Expect hlID('airline_c_red') == 0
+    call airline#themes#patch(g:airline#themes#dark#palette)
+    call airline#highlighter#add_accent('red')
+    call airline#highlighter#highlight(['normal'])
+    Expect hlID('airline_c_red') != 0
+  end
+end
+

t/init.vim

@@ -6,10 +6,11 @@ function! s:clear()
   endfor
 endfunction
 
-describe 'init'
+call airline#init#bootstrap()
+
+describe 'init sections'
   before
     call s:clear()
-    call airline#init#bootstrap()
     call airline#init#sections()
   end
 
@@ -28,7 +29,7 @@ describe 'init'
   end
 
   it 'section c should be file'
-    Expect g:airline_section_c == '%<%f%m'
+    Expect g:airline_section_c == '%<%f%m %#__accent_red#%{airline#util#wrap(airline#parts#readonly(),0)}%#__restore__#'
   end
 
   it 'section x should be filetype'
@@ -42,8 +43,8 @@ describe 'init'
 
   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'
+    Expect g:airline_section_z =~ '%4l'
+    Expect g:airline_section_z =~ '%3v'
   end
 
   it 'should not redefine sections already defined'
@@ -61,7 +62,16 @@ describe 'init'
     Expect airline#parts#get('branch').raw == ''
     Expect airline#parts#get('tagbar').raw == ''
     Expect airline#parts#get('syntastic').raw == ''
+    Expect airline#parts#get('eclim').raw == ''
     Expect airline#parts#get('whitespace').raw == ''
   end
 end
 
+describe 'init parts'
+  it 'should not redefine parts already defined'
+    call airline#parts#define_raw('linenr', 'bar')
+    call airline#init#sections()
+    Expect g:airline_section_z =~ 'bar'
+  end
+end
+

t/parts.vim

@@ -30,5 +30,10 @@ describe 'parts'
     call airline#parts#define_condition('part', '1')
     Expect airline#parts#get('part').condition == '1'
   end
+
+  it 'can define a accent'
+    call airline#parts#define_accent('part', 'red')
+    Expect airline#parts#get('part').accent == 'red'
+  end
 end
 

t/section.vim

@@ -1,6 +1,3 @@
-call airline#init#bootstrap()
-call airline#extensions#load()
-
 function! SectionSpec()
 endfunction
 
@@ -11,6 +8,11 @@ describe 'section'
     call airline#parts#define_function('func', 'SectionSpec')
   end
 
+  it 'should be able to reference default parts'
+    let s = airline#section#create(['paste'])
+    Expect s == '%{airline#util#wrap(airline#parts#paste(),0)}'
+  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)}'
@@ -26,16 +28,24 @@ describe 'section'
     Expect s == '%{airline#util#prepend("text",0)}%{airline#util#wrap("text",0)}'
   end
 
-  it 'should prefix with highlight group if provided'
+  it 'should prefix with accent group if provided and restore afterwards'
     call airline#parts#define('hi', {
           \ 'raw': 'hello',
-          \ 'highlight': 'hlgroup',
+          \ 'accent': 'red',
           \ })
     let s = airline#section#create(['hi'])
-    Expect s == '%#hlgroup#hello'
+    Expect s == '%#__accent_red#hello%#__restore__#'
+  end
+
+  it 'should accent functions'
+    call airline#parts#define_function('hi', 'Hello')
+    call airline#parts#define_accent('hi', 'bold')
+    let s = airline#section#create(['hi'])
+    Expect s == '%#__accent_bold#%{airline#util#wrap(Hello(),0)}%#__restore__#'
   end
 
   it 'should parse out a section from the distro'
+    call airline#extensions#load()
     let s = airline#section#create(['whitespace'])
     Expect s =~ 'airline#extensions#whitespace#check'
   end

t/themes.vim

@@ -33,5 +33,36 @@ describe 'themes'
     let hl = airline#themes#get_highlight2(['Foo','bg'], ['Foo','fg'], 'italic', 'bold')
     Expect hl == ['', '', 1, 0, 'italic,bold']
   end
+
+  it 'should generate color map with mirroring'
+    let map = airline#themes#generate_color_map(
+          \ [ 1, 1, 1, 1, '1' ],
+          \ [ 2, 2, 2, 2, '2' ],
+          \ [ 3, 3, 3, 3, '3' ],
+          \ )
+    Expect map.airline_a[0] == 1
+    Expect map.airline_b[0] == 2
+    Expect map.airline_c[0] == 3
+    Expect map.airline_x[0] == 3
+    Expect map.airline_y[0] == 2
+    Expect map.airline_z[0] == 1
+  end
+
+  it 'should generate color map with full set of colors'
+    let map = airline#themes#generate_color_map(
+          \ [ 1, 1, 1, 1, '1' ],
+          \ [ 2, 2, 2, 2, '2' ],
+          \ [ 3, 3, 3, 3, '3' ],
+          \ [ 4, 4, 4, 4, '4' ],
+          \ [ 5, 5, 5, 5, '5' ],
+          \ [ 6, 6, 6, 6, '6' ],
+          \ )
+    Expect map.airline_a[0] == 1
+    Expect map.airline_b[0] == 2
+    Expect map.airline_c[0] == 3
+    Expect map.airline_x[0] == 4
+    Expect map.airline_y[0] == 5
+    Expect map.airline_z[0] == 6
+  end
 end