Merge branch 'dev'

autoload/airline/extensions/ctrlp.vim

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

autoload/airline/extensions/default.vim

@@ -48,7 +48,7 @@ function! airline#extensions#default#apply(builder, context)
   if airline#util#getwinvar(winnr, 'airline_render_left', active || (!active && !g:airline_inactive_collapse))
     call <sid>build_sections(a:builder, a:context, s:layout[0])
   else
-    call a:builder.add_section('airline_a', '%f%m ')
+    call a:builder.add_section('airline_b', ' %f%m ')
     call a:builder.add_section('airline_c', '')
   endif
 

autoload/airline/extensions/tabline.vim

@@ -0,0 +1,85 @@
+" MIT License. Copyright (c) 2013 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+let s:fmod = get(g:, 'airline#extensions#tabline#fnamemod', ':p:.')
+let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
+
+function! airline#extensions#tabline#init(ext)
+  set showtabline=2
+  set tabline=%!airline#extensions#tabline#get()
+
+  call a:ext.add_theme_func('airline#extensions#tabline#load_theme')
+endfunction
+
+function! airline#extensions#tabline#load_theme(palette)
+  call airline#highlighter#exec('airline_tab', a:palette.normal.airline_b)
+  call airline#highlighter#exec('airline_tabsel', a:palette.normal.airline_a)
+  call airline#highlighter#exec('airline_tabtype', a:palette.visual.airline_a)
+  call airline#highlighter#exec('airline_tabfill', a:palette.normal.airline_c)
+  call airline#highlighter#exec('airline_tabmod', a:palette.insert.airline_a)
+endfunction
+
+function! airline#extensions#tabline#get()
+  if tabpagenr('$') == 1
+    return s:get_buffers()
+  else
+    return s:get_tabs()
+  endif
+endfunction
+
+function! airline#extensions#tabline#title(n)
+  let buflist = tabpagebuflist(a:n)
+  let winnr = tabpagewinnr(a:n)
+  return airline#extensions#tabline#get_buffer_name(buflist[winnr - 1])
+endfunction
+
+function! airline#extensions#tabline#get_buffer_name(nr)
+  let name = bufname(a:nr)
+  if empty(name)
+    return '[No Name]'
+  endif
+  return fnamemodify(name, s:fmod)
+endfunction
+
+function! s:get_buffers()
+  let b = airline#builder#new({'active': 1})
+  let cur = bufnr('%')
+  for nr in range(1, bufnr('$'))
+    if buflisted(nr) && bufexists(nr)
+      for ex in s:excludes
+        if match(bufname(nr), ex)
+          continue
+        endif
+      endfor
+      if cur == nr
+        if g:airline_detect_modified && getbufvar(nr, '&modified')
+          let group = 'airline_tabmod'
+        else
+          let group = 'airline_tabsel'
+        endif
+      else
+        let group = 'airline_tab'
+      endif
+      call b.add_section(group, '%( %{airline#extensions#tabline#get_buffer_name('.nr.')} %)')
+    endif
+  endfor
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  call b.add_section('airline_tabtype', ' buffers ')
+  return b.build()
+endfunction
+
+function! s:get_tabs()
+  let b = airline#builder#new({'active': 1})
+  for i in range(1, tabpagenr('$'))
+    let group = i == tabpagenr() ? 'airline_tabsel' : 'airline_tab'
+    call b.add_section(group, ' %{len(tabpagebuflist(tabpagenr()))}%( %'.i.'T %{airline#extensions#tabline#title('.i.')} %)')
+  endfor
+  call b.add_raw('%T')
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  call b.add_section('airline_tab', ' %999XX ')
+  call b.add_section('airline_tabtype', ' tabs ')
+  return b.build()
+endfunction
+