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/zig/config.vim | 4 +++-
 autoload/zig/fmt.vim    | 4 +++-
 autoload/zig/list.vim   | 4 +++-
 autoload/zig/util.vim   | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'autoload/zig')

diff --git a/autoload/zig/config.vim b/autoload/zig/config.vim
index d4f1a298..a35e73e8 100644
--- a/autoload/zig/config.vim
+++ b/autoload/zig/config.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/config.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/zig/config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index b1ec0bbe..c148ca2b 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/fmt.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/zig/fmt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/zig/list.vim b/autoload/zig/list.vim
index 8ab57d42..382a9882 100644
--- a/autoload/zig/list.vim
+++ b/autoload/zig/list.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/list.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/zig/list.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/zig/util.vim b/autoload/zig/util.vim
index 23d45758..0c803802 100644
--- a/autoload/zig/util.vim
+++ b/autoload/zig/util.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/util.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/zig/util.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
-- 
cgit v1.2.3