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/rust/debugging.vim   | 4 +++-
 autoload/rust/delimitmate.vim | 4 +++-
 autoload/rust/tags.vim        | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'autoload/rust')

diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index 3ddcc63c..d16380b5 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust/debugging.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/rust/debugging.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index c605742b..a60dece7 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust/delimitmate.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/rust/delimitmate.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/rust/tags.vim b/autoload/rust/tags.vim
index 10ce9440..84388174 100644
--- a/autoload/rust/tags.vim
+++ b/autoload/rust/tags.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust/tags.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/rust/tags.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
-- 
cgit v1.2.3