VimPlug/vim-airline
1
0
Fork 0
mirror of https://github.com/vim-airline/vim-airline.git synced 2026-02-24 02:28:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: fugitive renamed its functions

Browse Source 
this caused that the branch extension was not correctly working anymore
because of a refactoring of fugitive tpope/vim-fugitive@5d11ff7

Solution: Move the existence check for the fugitive plugin into a
separate function and call it from there in all places that check the
fugitive plugin. Do the same for lawrencium and vcscommand check.

fixes #605 #1739
This commit is contained in:
Christian Brabandt
2018-06-04 17:31:13 +02:00
parent 08570b6dcb
commit 30a3c4f549
4 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
autoload/airline/extensions.vim
View File

@@ -221,9 +221,11 @@ function! airline#extensions#load()
let s:filetype_regex_overrides['^int-'] = ['vimshell','%{substitute(&ft, "int-", "", "")}']
endif
if get(g:, 'airline#extensions#branch#enabled', 1)
\ && (exists('*fugitive#head') || exists('*lawrencium#statusline') ||
\ (get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')))
if get(g:, 'airline#extensions#branch#enabled', 1) && (
\ airline#util#has_fugitive() ||
\ airline#util#has_lawrencium() ||
\ airline#util#has_vcscommand() ||
\ airline#util#has_custom_scm())
call airline#extensions#branch#init(s:ext)
call add(loaded_ext, 'branch')
endif
@@ -235,7 +237,7 @@ function! airline#extensions#load()
endif
if get(g:, 'airline#extensions#fugitiveline#enabled', 1)
\ && exists('*fugitive#head')
\ && airline#util#has_fugitive()
\ && index(loaded_ext, 'bufferline') == -1
call airline#extensions#fugitiveline#init(s:ext)
call add(loaded_ext, 'fugitiveline')