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

Disable fugitiveline if bufferline is activated 

This fixes the conflict of both plugins redifining the 'file' (or 'path')
function. Closes #1670.
As fugitiveline modifies the path display and bufferline replaces it,
the latter should be the plugin to be used if both are activated.
This commit is contained in:
Cimbali 2018-03-03 16:48:06 +01:00
parent 55a9721c22
commit 9912ce13a4
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autoload/airline/extensions.vim
View File

@ -231,6 +231,7 @@ function! airline#extensions#load()
if get(g:, 'airline#extensions#fugitiveline#enabled', 1) if get(g:, 'airline#extensions#fugitiveline#enabled', 1)
\ && exists('*fugitive#head') \ && exists('*fugitive#head')
\ && index(loaded_ext, 'bufferline') == -1
call airline#extensions#fugitiveline#init(s:ext) call airline#extensions#fugitiveline#init(s:ext)
call add(loaded_ext, 'fugitiveline') call add(loaded_ext, 'fugitiveline')
endif endif

1
doc/airline.txt
View File

@ -406,6 +406,7 @@ vim-bufferline <https://github.com/bling/vim-bufferline>
------------------------------------- *airline-fugitiveline* ------------------------------------- *airline-fugitiveline*
This extension hides the fugitive://**// part of the buffer names, to only This extension hides the fugitive://**// part of the buffer names, to only
show the file name as if it were in the current working tree. show the file name as if it were in the current working tree.
It is deactivated by default if *airline-bufferline* is activated.
* enable/disable bufferline integration > * enable/disable bufferline integration >
let g:airline#extensions#fugitiveline#enabled = 1 let g:airline#extensions#fugitiveline#enabled = 1