RepoMirrors
/
vim-airline
mirror of https://github.com/vim-airline/vim-airline
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix branch detection

This commit is contained in:
Bailey Ling 2013-08-06 00:42:59 -04:00
parent 990e3fc949
commit e858eaa990
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autoload/airline.vim
View File

@ -143,7 +143,6 @@ function! airline#update_statusline()
endfor endfor
endfunction endfunction
let g:airline_current_mode_text = ''
function! airline#update_highlight() function! airline#update_highlight()
if get(w:, 'airline_active', 1) if get(w:, 'airline_active', 1)
let l:m = mode() let l:m = mode()

19
autoload/airline/extensions/branch.vim
View File

@ -1,14 +1,15 @@
" MIT license. Copyright (c) 2013 Bailey Ling. " MIT license. Copyright (c) 2013 Bailey Ling.
" vim: ts=2 sts=2 sw=2 fdm=indent " vim: ts=2 sts=2 sw=2 fdm=indent
function! airline#extensions#branch#init(ext) function! airline#extensions#branch#apply()
if g:airline_section_b == '' let g:airline_current_branch = exists('*fugitive#head') && strlen(fugitive#head()) > 0
let g:airline_section_b = \ ? g:airline_branch_prefix.fugitive#head()
\ exists('*fugitive#head') && strlen(fugitive#head()) > 0 \ : exists('*lawrencium#statusline') && strlen(lawrencium#statusline()) > 0
\ ? g:airline_branch_prefix.fugitive#head() \ ? g:airline_branch_prefix.lawrencium#statusline()
\ : exists('*lawrencium#statusline') && strlen(lawrencium#statusline()) > 0 \ : ''
\ ? g:airline_branch_prefix.lawrencium#statusline() endfunction
\ : ''
endif function! airline#extensions#branch#init(ext)
call a:ext.add_statusline_funcref(function('airline#extensions#branch#apply'))
endfunction endfunction

4
plugin/airline.vim
View File

@ -48,8 +48,8 @@ call s:check_defined('g:airline_mode_map', {
\ '' : 'V-BLOCK', \ '' : 'V-BLOCK',
\ }) \ })
call s:check_defined('g:airline_section_a', '%{g:airline_current_mode_text}') call s:check_defined('g:airline_section_a', '%{get(g:, "airline_current_mode_text", "")}')
call s:check_defined('g:airline_section_b', '') call s:check_defined('g:airline_section_b', '%{get(g:, "airline_current_branch", "")}')
call s:check_defined('g:airline_section_c', '%f%m') call s:check_defined('g:airline_section_c', '%f%m')
call s:check_defined('g:airline_section_gutter', '') call s:check_defined('g:airline_section_gutter', '')
call s:check_defined('g:airline_section_x', "%{strlen(&filetype)>0?&filetype:''}") call s:check_defined('g:airline_section_x', "%{strlen(&filetype)>0?&filetype:''}")