Fix recursive loading, closes #605

58 files changed, 174 insertions, 58 deletions

diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index 132437ed..f498e5df 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/LaTeXtoUnicode.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/LaTeXtoUnicode.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/RstFold.vim b/autoload/RstFold.vim
index dc1044f7..926bc1b9 100644
--- a/autoload/RstFold.vim
+++ b/autoload/RstFold.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/RstFold.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/RstFold.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/ada.vim b/autoload/ada.vim
index e01b83ae..9a01456c 100644
--- a/autoload/ada.vim
+++ b/autoload/ada.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/ada.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/ada.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index a8b35e73..068cfa89 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/cargo.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/cargo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index 630928f5..7f3fffa1 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/cargo/quickfix.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/cargo/quickfix.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index 70c1d4ce..02857c7b 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/clojurecomplete.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/clojurecomplete.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/coffee.vim b/autoload/coffee.vim
index c3376640..0388a589 100644
--- a/autoload/coffee.vim
+++ b/autoload/coffee.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/coffee.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/coffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/crystal/indent.vim b/autoload/crystal/indent.vim
index d50c6e29..fbbf91fd 100644
--- a/autoload/crystal/indent.vim
+++ b/autoload/crystal/indent.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/crystal/indent.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/crystal/indent.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/crystal_lang.vim b/autoload/crystal_lang.vim
index 3b10ecbd..1a1ad421 100644
--- a/autoload/crystal_lang.vim
+++ b/autoload/crystal_lang.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/crystal_lang.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/crystal_lang.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/csv.vim b/autoload/csv.vim
index a5116306..692ec2a3 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/csv.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/csv.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/dart.vim b/autoload/dart.vim
index bbb1de21..ccd29b44 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/dart.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/dart.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/db/adapter/ecto.vim b/autoload/db/adapter/ecto.vim
index f97301e9..7eca1262 100644
--- a/autoload/db/adapter/ecto.vim
+++ b/autoload/db/adapter/ecto.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/db/adapter/ecto.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/db/adapter/ecto.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/ecrystal.vim b/autoload/ecrystal.vim
index 658d5bd8..5225c753 100644
--- a/autoload/ecrystal.vim
+++ b/autoload/ecrystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/ecrystal.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/ecrystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index 61015846..ccd02881 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/elixir/indent.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/elixir/indent.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/elixir/util.vim b/autoload/elixir/util.vim
index de7972de..7acc8814 100644
--- a/autoload/elixir/util.vim
+++ b/autoload/elixir/util.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/elixir/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/elixir/util.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/fish.vim b/autoload/fish.vim
index 2cc6fcfb..fb2dda13 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/fish.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/fish.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index a7abc1d7..0331814c 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/fsharp.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/fsharp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/fzf_gitignore.vim b/autoload/fzf_gitignore.vim
index a482c030..bd90be48 100644
--- a/autoload/fzf_gitignore.vim
+++ b/autoload/fzf_gitignore.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/fzf_gitignore.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/fzf_gitignore.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index c58b983a..3ddde740 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/go/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/go/config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/graphql.vim b/autoload/graphql.vim
index 49c63437..b5ddd9fa 100644
--- a/autoload/graphql.vim
+++ b/autoload/graphql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/graphql.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/graphql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/htmlcomplete.vim b/autoload/htmlcomplete.vim
index ae83ea68..7db1fdb9 100644
--- a/autoload/htmlcomplete.vim
+++ b/autoload/htmlcomplete.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/htmlcomplete.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/htmlcomplete.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/jsonnet.vim b/autoload/jsonnet.vim
index 0f1272db..c05e2f86 100644
--- a/autoload/jsonnet.vim
+++ b/autoload/jsonnet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/jsonnet.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/jsonnet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/jsx_pretty/comment.vim b/autoload/jsx_pretty/comment.vim
index 15442453..5a9db367 100644
--- a/autoload/jsx_pretty/comment.vim
+++ b/autoload/jsx_pretty/comment.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/jsx_pretty/comment.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/jsx_pretty/comment.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/jsx_pretty/indent.vim b/autoload/jsx_pretty/indent.vim
index 77d62038..34f88db0 100644
--- a/autoload/jsx_pretty/indent.vim
+++ b/autoload/jsx_pretty/indent.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/jsx_pretty/indent.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/jsx_pretty/indent.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/julia.vim b/autoload/julia.vim
index daaa9f44..d76454a4 100644
--- a/autoload/julia.vim
+++ b/autoload/julia.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia.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/julia.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index 7e6b5d31..e9e77d8c 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia/doc.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/julia/doc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index 634462d6..7dd87df9 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia_blocks.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/julia_blocks.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/julia_latex_symbols.vim b/autoload/julia_latex_symbols.vim
index 23101f78..5f4c9890 100644
--- a/autoload/julia_latex_symbols.vim
+++ b/autoload/julia_latex_symbols.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia_latex_symbols.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/julia_latex_symbols.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/ledger.vim b/autoload/ledger.vim
index cb7acfe7..badcb175 100644
--- a/autoload/ledger.vim
+++ b/autoload/ledger.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/ledger.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/ledger.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/nim.vim b/autoload/nim.vim
index cf7bb378..fdf990fc 100644
--- a/autoload/nim.vim
+++ b/autoload/nim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/nim.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/nim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/pony.vim b/autoload/pony.vim
index 85506e8b..5f26c52b 100644
--- a/autoload/pony.vim
+++ b/autoload/pony.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/pony.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/pony.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
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
diff --git a/autoload/python/utils.vim b/autoload/python/utils.vim
index 283d785a..4a02520d 100644
--- a/autoload/python/utils.vim
+++ b/autoload/python/utils.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/python/utils.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/python/utils.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/requirements.vim b/autoload/requirements.vim
index 79be715c..e945a652 100644
--- a/autoload/requirements.vim
+++ b/autoload/requirements.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/requirements.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/requirements.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/rubycomplete.vim b/autoload/rubycomplete.vim
index 1e8a6f0d..0b8871cb 100644
--- a/autoload/rubycomplete.vim
+++ b/autoload/rubycomplete.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rubycomplete.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/rubycomplete.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/rust.vim b/autoload/rust.vim
index bab6a11f..b8bef48d 100644
--- a/autoload/rust.vim
+++ b/autoload/rust.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust.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.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
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
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index c847219b..2e2a10da 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rustfmt.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/rustfmt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/smt2.vim b/autoload/smt2.vim
index b081d345..7a9fa7f8 100644
--- a/autoload/smt2.vim
+++ b/autoload/smt2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/smt2.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/smt2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index 2380a395..e780440b 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/terraform.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/terraform.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal.vim b/autoload/vital/_crystal.vim
index ffa30240..b8ac5d32 100644
--- a/autoload/vital/_crystal.vim
+++ b/autoload/vital/_crystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal.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/vital/_crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim
index 58996327..59c0ec88 100644
--- a/autoload/vital/_crystal/ColorEcho.vim
+++ b/autoload/vital/_crystal/ColorEcho.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/ColorEcho.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/vital/_crystal/ColorEcho.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim
index 06461525..b2045a2a 100644
--- a/autoload/vital/_crystal/Data/List.vim
+++ b/autoload/vital/_crystal/Data/List.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/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/vital/_crystal/Data/List.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim
index 7e6ced35..8f6ddf3e 100644
--- a/autoload/vital/_crystal/Data/String.vim
+++ b/autoload/vital/_crystal/Data/String.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/String.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/vital/_crystal/Data/String.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim
index a7bbedad..315a4343 100644
--- a/autoload/vital/_crystal/Process.vim
+++ b/autoload/vital/_crystal/Process.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Process.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/vital/_crystal/Process.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim
index 891bd2dc..c17269cf 100644
--- a/autoload/vital/_crystal/Web/JSON.vim
+++ b/autoload/vital/_crystal/Web/JSON.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Web/JSON.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/vital/_crystal/Web/JSON.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/crystal.vim b/autoload/vital/crystal.vim
index ca8c320e..7674c4ef 100644
--- a/autoload/vital/crystal.vim
+++ b/autoload/vital/crystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/crystal.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/vital/crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/xml/aria.vim b/autoload/xml/aria.vim
index 1cd801fe..ff8a071c 100644
--- a/autoload/xml/aria.vim
+++ b/autoload/xml/aria.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/xml/aria.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/xml/aria.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/xml/html5.vim b/autoload/xml/html5.vim
index 6e526be6..7bbc9586 100644
--- a/autoload/xml/html5.vim
+++ b/autoload/xml/html5.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/xml/html5.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/xml/html5.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/xml/xsd.vim b/autoload/xml/xsd.vim
index ad3630da..5757ae84 100644
--- a/autoload/xml/xsd.vim
+++ b/autoload/xml/xsd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/xml/xsd.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/xml/xsd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
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