From 44b1e3df5da6252b5c7f7d9f707713c8353ac8e7 Mon Sep 17 00:00:00 2001 From: kazukazuinaina Date: Tue, 17 Dec 2019 19:08:08 +0900 Subject: [PATCH] can choice to use gina's extension fix typo add v:version >= 800and remove v:version > 704 fix CI error --- autoload/airline/extensions.vim | 2 +- autoload/airline/util.vim | 2 +- doc/airline.txt | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim index 6039c4f1..14997dad 100644 --- a/autoload/airline/extensions.vim +++ b/autoload/airline/extensions.vim @@ -34,7 +34,7 @@ let s:filetype_overrides = { \ 'vimshell': ['vimshell','%{vimshell#get_status_string()}'], \ } -if exists(':Gina') && (v:version > 704 || (v:version == 704 && has("patch1898"))) +if airline#util#has_gina() && get(g:, 'airline#extensions#gina_status', 1) " Gina needs the Vim 7.4.1898, which introduce the flag for custom commands let s:filetype_overrides['gina-status'] = ['gina', '%{gina#component#repo#preset()}' ] let s:filetype_overrides['diff'] = ['gina', '%{gina#component#repo#preset()}' ] diff --git a/autoload/airline/util.vim b/autoload/airline/util.vim index 5372175c..c2a7ee15 100644 --- a/autoload/airline/util.vim +++ b/autoload/airline/util.vim @@ -137,7 +137,7 @@ endfunction function! airline#util#has_gina() if !exists("s:has_gina") - let s:has_gina = exists(':Gina') + let s:has_gina = (exists(':Gina') && v:version >= 800) endif return s:has_gina endfunction diff --git a/doc/airline.txt b/doc/airline.txt index 1099f3ae..f4c0f9c0 100644 --- a/doc/airline.txt +++ b/doc/airline.txt @@ -709,6 +709,10 @@ gina.vim Airline displays the gina.vim specific statusline. (for details, see the help of gina.vim) +* enable/disable bufferline integration > + let g:airline#extensions#gina_status = 1 +< default: 1 + ------------------------------------- *airline-grepper* vim-grepper