From cbde2571d4f79770ac552fe75440de72893bc73a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 25 Oct 2020 03:19:58 +0100
Subject: Respect symlinks for resolving vim-polyglot as fallback, closes #605

---
 ftplugin/make.vim | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'ftplugin/make.vim')

diff --git a/ftplugin/make.vim b/ftplugin/make.vim
index a077f521..02b0e320 100644
--- a/ftplugin/make.vim
+++ b/ftplugin/make.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/make.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('make', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'make') == -1
 
 " Vim filetype plugin file
 " Language:	Make
@@ -40,5 +35,3 @@ let &l:include = '^\s*include'
 if exists("loaded_matchit")
   let b:match_words = '^ *ifn\=\(eq\|def\)\>:^ *else\(\s\+ifn\=\(eq\|def\)\)\=\>:^ *endif\>,\<define\>:\<endef\>,^!\s*if\(n\=def\)\=\>:^!\s*else\(if\(n\=def\)\=\)\=\>:^!\s*endif\>'
 endif
-
-endif
-- 
cgit v1.2.3