a min tab count of 1 is the same as always showing (#304).

Added lucius.vim to airline themes

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] and [virtualenv][31].
 *  Looks good with regular fonts and provides configuration points so you can use unicode or powerline symbols.
 *  Optimized for speed; it loads in under a millisecond.
 *  Extensive suite of themes for popular colorschemes including [solarized][23] (dark and light), [tomorrow][24] (all variants), [base16][32] (all variants), [molokai][25], [jellybeans][26] and others; have a look at the [screenshots][14] in the wiki.
 *  Supports 7.2 as the minimum Vim version.
-*  Stable release cycle; bleeding edge changes happen on the `dev` branch, and after they have gone through a [full regression test][33] will eventually be merged in the stable master branch.  Releases typically occur every 2 weeks.
+*  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).
@@ -77,6 +82,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.
@@ -187,3 +196,4 @@ 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

autoload/airline.vim

@@ -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()
@@ -96,7 +120,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)

autoload/airline/builder.vim

@@ -8,6 +8,10 @@ function! s:prototype.split(...)
   let self._line .= '%#'.self._curgroup.'#'.(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
@@ -23,7 +27,21 @@ function! s:prototype.add_section(group, contents)
     let self._line .= '%#'.a:group.'#'
   endif
 
-  let self._line .= a:contents
+  if 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
+
+  let self._line .= line
   let self._curgroup = a:group
 endfunction
 

autoload/airline/deprecation.vim

@@ -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

@@ -50,22 +50,22 @@ 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_b = '%{get(w:, "quickfix_title", "")}'
     let w:airline_section_c = ''
     let w:airline_section_x = ''
   elseif &buftype == 'help'
@@ -168,7 +168,7 @@ 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'))
     call airline#extensions#branch#init(s:ext)
   endif
 
@@ -181,6 +181,10 @@ function! airline#extensions#load()
     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)
@@ -204,7 +208,10 @@ function! airline#extensions#load()
       if !get(g:, 'airline#extensions#'.name.'#enabled', 1)
         continue
       endif
-      call airline#extensions#{name}#init(s:ext)
+      try
+        call airline#extensions#{name}#init(s:ext)
+      catch
+      endtry
     endif
   endfor
 endfunction

autoload/airline/extensions/branch.vim

@@ -1,14 +1,18 @@
 " MIT License. Copyright (c) 2013 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')
 
+if !s:has_fugitive && !s:has_lawrencium
+  finish
+endif
+
+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)
+
 function! airline#extensions#branch#get_head()
   let head = ''
 
@@ -29,14 +33,26 @@ function! airline#extensions#branch#get_head()
 
   return empty(head) || !s:check_in_path()
         \ ? s:empty_message
-        \ : printf('%s%s', empty(s:symbol) ? '' : s:symbol.' ', head)
+        \ : printf('%s%s', empty(s:symbol) ? '' : s: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')
+
+    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
+
     let b:airline_file_in_root = stridx(bufferpath, root) > -1
   endif
   return b:airline_file_in_root

autoload/airline/extensions/bufferline.vim

@@ -1,6 +1,10 @@
 " MIT License. Copyright (c) 2013 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/commandt.vim

@@ -1,6 +1,10 @@
 " MIT License. Copyright (c) 2013 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.
 " 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.
 " 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,25 @@ 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: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_raw('%#CtrlPdark#'.a:1.(g:airline_symbols.space))
+  call b.add_section_spaced('CtrlPdark', a:2)
+  call b.add_section_spaced('CtrlPlight', '%{getcwd()}')
+  return b.build()
 endfunction
 
 " Argument: len
@@ -51,7 +63,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

@@ -2,7 +2,7 @@
 " 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,19 +29,33 @@ 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

autoload/airline/extensions/eclim.vim

@@ -0,0 +1,35 @@
+" MIT License. Copyright (c) 2013 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)
+    let errorsLine = eclimList[0]['line']
+    let errorsNumber = len(eclimList)
+    let errors = "[Eclim: line:".string(errorsLine)." (".string(errorsNumber).")]"
+    if !exists(':SyntasticCheck') || SyntasticStatuslineFlag() == ''
+      return errors.(g:airline_symbols.space)
+    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.
 " 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.
 " vim: et ts=2 sts=2 sw=2
 
+if !get(g:, 'loaded_signify', 0) && !get(g:, 'loaded_gitgutter', 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', ['+', '~', '-'])
 

autoload/airline/extensions/syntastic.vim

@@ -1,10 +1,14 @@
 " MIT License. Copyright (c) 2013 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

@@ -8,17 +8,19 @@ 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),
       \ }
+if get(g:, 'airline_powerline_fonts', 0)
+  let s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , "\ue0b0")
+  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , "\ue0b1")
+else
+  let s:builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , ' ')
+  let s:builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , '|')
+endif
 
 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:tab_min_count = get(g:, 'airline#extensions#tabline#tab_min_count', 0)
 
 function! airline#extensions#tabline#init(ext)
   if has('gui_running')
@@ -27,10 +29,14 @@ function! airline#extensions#tabline#init(ext)
 
   set tabline=%!airline#extensions#tabline#get()
 
-  if s:buf_min_count <= 0
+  if s:buf_min_count <= 0 && s:tab_min_count <= 1
     set showtabline=2
   else
-    autocmd CursorMoved * call <sid>cursormove()
+    if s:show_buffers == 1
+      autocmd CursorMoved * call <sid>on_cursormove(s:buf_min_count, len(s:get_buffer_list()))
+    else
+      autocmd TabEnter * call <sid>on_cursormove(s:tab_min_count, tabpagenr('$'))
+    endif
   endif
 
   call a:ext.add_theme_func('airline#extensions#tabline#load_theme')
@@ -52,9 +58,8 @@ function! airline#extensions#tabline#load_theme(palette)
   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
+function! s:on_cursormove(min_count, total_count)
+  if a:total_count >= a:min_count
     if &showtabline != 2
       set showtabline=2
     endif
@@ -93,20 +98,66 @@ function! s:get_buffer_list()
           continue
         endif
       endfor
+      if getbufvar(nr, 'current_syntax') == 'qf'
+        continue
+      endif
       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]
+  let s:current_buffer_list = buffers
+  return buffers
+endfunction
+
+function! s:get_visible_buffers()
+  let buffers = s:get_buffer_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_buffer_list = buffers
   return buffers
 endfunction
 
@@ -114,7 +165,11 @@ 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()
+  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'
@@ -156,7 +211,7 @@ function! s:get_tabs()
     if s:tab_nr_type == 0
       let val .= ' %{len(tabpagebuflist('.i.'))}'
     else
-      let val .= ' '.i
+      let val .= (g:airline_symbols.space).i
     endif
     call b.add_section(group, val.'%'.i.'T %{airline#extensions#tabline#title('.i.')} %)')
   endfor

autoload/airline/extensions/tagbar.vim

@@ -1,14 +1,19 @@
 " MIT License. Copyright (c) 2013 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
 

autoload/airline/extensions/undotree.vim

@@ -1,6 +1,10 @@
 " MIT License. Copyright (c) 2013 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.
 " 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,20 @@
 " MIT License. Copyright (c) 2013 Bailey Ling.
 " vim: et ts=2 sts=2 sw=2
 
+if !get(g:, 'virtualenv_loaded', 0)
+  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()}')
+    call airline#extensions#append_to_section('x',
+          \ s:spc.g:airline_right_alt_sep.s:spc.'%{virtualenv#statusline()}')
   endif
 endfunction
 

autoload/airline/extensions/whitespace.vim

@@ -19,7 +19,7 @@ let s:mixed_indent_format = get(g:, 'airline#extensions#whitespace#mixed_indent_
 let s:enabled = 1
 
 function! airline#extensions#whitespace#check()
-  if &readonly || !s:enabled
+  if &readonly || !&modifiable || !s:enabled
     return ''
   endif
 
@@ -38,14 +38,14 @@ function! airline#extensions#whitespace#check()
     endif
 
     if trailing != 0 || mixed
-      let b:airline_whitespace_check = s:symbol.' '
+      let b:airline_whitespace_check = s:symbol
       if s:show_message
         if trailing != 0
-          let b:airline_whitespace_check .= printf(s:trailing_format, trailing)
+          let b:airline_whitespace_check .= (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)
+          let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:mixed_indent_format, mixnr)
         endif
       endif
     endif

autoload/airline/highlighter.vim

@@ -109,6 +109,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 +118,24 @@ 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(p.accents)
+          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

@@ -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,27 +56,35 @@ 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'])
+
+  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'])
   endif
@@ -79,10 +92,10 @@ function! airline#init#sections()
     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 +104,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(['%3p%%'.spc, 'linenr', ':%3c '])
   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

@@ -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

@@ -2,16 +2,20 @@
 " 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')
+    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 +23,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
@@ -48,7 +52,7 @@ function! s:create(parts, append)
       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
+" 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_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)
+
+    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)
+    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)
+    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)
+    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,12 +50,12 @@ 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 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, '', ''],
       \ }

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/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/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      , ''      , ''     ] ,
       \ }
 
+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,46 @@
+let g:airline#themes#murmur#palette = {}
+
+let s:termbg = 237  " Background for branch and file format blocks
+let s:termbg2= 234  " Background for middle block
+let s:normalbg= 27  " Background for normal mode and file position blocks
+let s:insertbg= 70  " Background for insert mode and file position blocks
+let s:visualbg= 166 " Background for visual mode and file position blocks
+let s:replacebg=88  " Background for replace mode and file position blocks
+let s:alert= 88     " Modefied file alert color
+
+let s:BB = ['#AFAF87', '#5F5F5F', 144, s:termbg] " Branch and file format blocks
+
+let s:N1 = ['#FFFFFF', '#5F87FF', 15, s:normalbg]   " Outside blocks in normal mode
+let s:N2 = ['#AFAF87', '#5F5F5F', 39, s: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': ['#ffffff', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+
+let s:I1 = ['#FFFFFF', '#87AF5F', 15, s:insertbg]         " Outside blocks in insert mode
+let s:I2 = ['#AFAF87', '#5F5F5F', s:insertbg, s: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': ['#AFAF87', '#5F5F5F', s:alert, s:termbg2, 'bold'] ,}
+
+let s:R1 = ['#FFFFFF', '#870000', 15, s:replacebg]  " Outside blocks in replace mode
+let s:R2 = ['#AFAF87', '#5F5F5F', 255, s: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': ['#AFAF87', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+
+let s:V1 = ['#FFFFFF', '#AF5F00', 15, s:visualbg]         " Outside blocks in visual mode
+let s:V2 = ['#AFAF87', '#5F5F5F', s:visualbg, s: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': [ '#AFAF87', '#5f005f', s:alert, s:termbg2, 'bold'] ,}
+
+" Inactive mode
+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#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(
+      \ ['#FFFFFF', '#5F87FF', 15, s:normalbg, ''],
+      \ ['#AFAF87', '#5F5F5F', 144, s:termbg, ''],
+      \ ['#AFAF87', '#5F5F5F', 39, s: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/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/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' , '#ff3535' , 231 , 203 , '' ] ,
+      \ }
+
+
+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': [ '#ffffff' , '#ff6868' , 225 , 167 , '' ] ,
+      \ }
+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': [ '#ffffff' , '#ff3535' , 231 , 203 , '' ] ,
+      \ }
+
+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':   ['#ffffff', '#ff6868',  231, 167, ''],
+      \ }
+
+let s:WI = [ '#eeeeee', '#ff0f38', 255, 201 ]
+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,55 +35,43 @@ 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], '']
   else
-    let s:NM = [s:red, s:N3[1], '']
+    let s:NM = [s:base01, 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
+
+  " 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
   if s:background == 'dark'
@@ -101,20 +87,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]]}
 
   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 +115,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 +169,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

@@ -2,6 +2,7 @@
 " 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.  >
@@ -116,7 +136,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.
 
 ==============================================================================
 CUSTOMIZATION                                        *airline-customization*
@@ -124,9 +147,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 = '▶'
@@ -197,7 +224,7 @@ 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,
@@ -276,12 +303,24 @@ 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
@@ -339,7 +378,13 @@ virtualenv <https://github.com/jmcantrell/vim-virtualenv>
 * 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 = ''
@@ -347,7 +392,7 @@ virtualenv <https://github.com/jmcantrell/vim-virtualenv>
   let g:airline#extensions#tabline#right_sep = ''
   let g:airline#extensions#tabline#right_alt_sep = ''
 <
-Note: Enabling this extension will modify |showtabline| and |guioptions|.
+Note: Enabling this extension will modify 'showtabline' and 'guioptions'.
 
 ==============================================================================
 ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
@@ -378,6 +423,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 +472,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.
 
@@ -492,15 +568,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 +611,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
 <

plugin/airline.vim

@@ -98,6 +98,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 <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'
@@ -37,6 +38,25 @@ 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
 end
 
 describe 'inactive builder'
@@ -50,5 +70,11 @@ describe 'inactive builder'
     let stl = s:builder.build()
     Expect stl =~ '%#Normal_inactive#hello%#Normal_to_NonText_inactive#>%#NonText_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,3 +1,4 @@
+let g:airline_theme = 'dark'
 call airline#init#bootstrap()
 call airline#init#sections()
 source plugin/airline.vim

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,20 @@
+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#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,7 +43,7 @@ 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 =~ '%4l'
     Expect g:airline_section_z =~ '%3c'
   end
 
@@ -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