From d73c4d156279bfbc2ea9fafcbacca5fc2bd6cfd1 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 24 Oct 2020 23:50:54 +0200
Subject: Fix recursive loading, closes #605

---
 autoload/puppet/align.vim  | 4 +++-
 autoload/puppet/ctags.vim  | 4 +++-
 autoload/puppet/format.vim | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'autoload/puppet')

diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim
index 712b686b..4fafac3d 100644
--- a/autoload/puppet/align.vim
+++ b/autoload/puppet/align.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/puppet/align.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'autoload/puppet/align.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim
index a86490bb..fad4f87a 100644
--- a/autoload/puppet/ctags.vim
+++ b/autoload/puppet/ctags.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/puppet/ctags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'autoload/puppet/ctags.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/puppet/format.vim b/autoload/puppet/format.vim
index 50337849..94fe42e7 100644
--- a/autoload/puppet/format.vim
+++ b/autoload/puppet/format.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/puppet/format.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+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, 'autoload/puppet/format.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
-- 
cgit v1.2.3