From cbde2571d4f79770ac552fe75440de72893bc73a Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Sun, 25 Oct 2020 03:19:58 +0100 Subject: Respect symlinks for resolving vim-polyglot as fallback, closes #605 --- ftplugin/git.vim | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'ftplugin/git.vim') diff --git a/ftplugin/git.vim b/ftplugin/git.vim index 78352e84..13ae96b6 100644 --- a/ftplugin/git.vim +++ b/ftplugin/git.vim @@ -1,11 +1,6 @@ -let s:base = expand(":h:h") -let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" } -let files = filter(globpath(&rtp, 'ftplugin/git.vim', 1, 1), Filter) -if len(files) > 0 - exec 'source ' . files[0] +if !polyglot#util#IsEnabled('git', expand(':p')) finish endif -if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1 " Vim filetype plugin " Language: generic git output @@ -48,5 +43,3 @@ endif setlocal includeexpr=substitute(v:fname,'^[^/]\\+/','','') let b:undo_ftplugin = "setl keywordprg< path< includeexpr<" - -endif -- cgit v1.2.3