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/json.vim | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'ftplugin/json.vim')

diff --git a/ftplugin/json.vim b/ftplugin/json.vim
index 9b2d9056..f55b4b0a 100644
--- a/ftplugin/json.vim
+++ b/ftplugin/json.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/json.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('json', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 
 " Vim syntax file
 " Language:	JSON
@@ -45,5 +40,3 @@ if has('conceal')
 	"maybe g:vim_json_syntax_conceal could be settable to 0,1,2 to map
 	"directly to vim's conceallevels? unsure if anyone cares
 endif
-
-endif
-- 
cgit v1.2.3