Fix recursive loading, closes #605

author: Adam Stankiewicz <sheerun@sher.pl> 2020-10-24 23:50:54 +0200
committer: Adam Stankiewicz <sheerun@sher.pl> 2020-10-24 23:50:54 +0200
commit: d73c4d156279bfbc2ea9fafcbacca5fc2bd6cfd1 (patch)
tree: 02e5ede89ee8e6066dc8c4e11033c8ec1684a1dc /indent
parent: 20b31f533764c4c32582124de8d8a6f6c9499c8a (diff)
download: vim-polyglot-d73c4d156279bfbc2ea9fafcbacca5fc2bd6cfd1.tar.gz
vim-polyglot-d73c4d156279bfbc2ea9fafcbacca5fc2bd6cfd1.zip
182 files changed, 546 insertions, 182 deletions
diff --git a/indent/Jenkinsfile.vim b/indent/Jenkinsfile.vim
index 28602479..438d6991 100644
--- a/indent/Jenkinsfile.vim
+++ b/indent/Jenkinsfile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/Jenkinsfile.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, 'indent/Jenkinsfile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/aap.vim b/indent/aap.vim
index 41140ace..799112c8 100644
--- a/indent/aap.vim
+++ b/indent/aap.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/aap.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, 'indent/aap.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ada.vim b/indent/ada.vim
index 249c7afa..3240a795 100644
--- a/indent/ada.vim
+++ b/indent/ada.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/ada.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ansible.vim b/indent/ansible.vim
index 2632f893..6686d9ab 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ansible.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, 'indent/ansible.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ant.vim b/indent/ant.vim
index fc948477..d0af9c74 100644
--- a/indent/ant.vim
+++ b/indent/ant.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ant.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, 'indent/ant.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/applescript.vim b/indent/applescript.vim
index d58e92cc..0e31d286 100644
--- a/indent/applescript.vim
+++ b/indent/applescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/applescript.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, 'indent/applescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/arduino.vim b/indent/arduino.vim
index a265ea02..90c72c7c 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/arduino.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, 'indent/arduino.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/autohotkey.vim b/indent/autohotkey.vim
index 1d0a0936..354ceeb9 100644
--- a/indent/autohotkey.vim
+++ b/indent/autohotkey.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/autohotkey.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, 'indent/autohotkey.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/automake.vim b/indent/automake.vim
index 27272c5e..4bded6f7 100644
--- a/indent/automake.vim
+++ b/indent/automake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/automake.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, 'indent/automake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/awk.vim b/indent/awk.vim
index 17082d35..5e802ecd 100644
--- a/indent/awk.vim
+++ b/indent/awk.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/awk.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, 'indent/awk.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/bib.vim b/indent/bib.vim
index 802fa688..619859fc 100644
--- a/indent/bib.vim
+++ b/indent/bib.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/bib.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, 'indent/bib.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/blade.vim b/indent/blade.vim
index 0ab2e45c..efdecf32 100644
--- a/indent/blade.vim
+++ b/indent/blade.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/blade.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, 'indent/blade.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/bst.vim b/indent/bst.vim
index ac2f9bfe..adc852ae 100644
--- a/indent/bst.vim
+++ b/indent/bst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/bst.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, 'indent/bst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/bzl.vim b/indent/bzl.vim
index deea163c..e41ba9c9 100644
--- a/indent/bzl.vim
+++ b/indent/bzl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/bzl.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, 'indent/bzl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cabal.vim b/indent/cabal.vim
index b81a8277..1698e16d 100644
--- a/indent/cabal.vim
+++ b/indent/cabal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cabal.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, 'indent/cabal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/caddyfile.vim b/indent/caddyfile.vim
index b3a5c20e..11980473 100644
--- a/indent/caddyfile.vim
+++ b/indent/caddyfile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/caddyfile.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, 'indent/caddyfile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cdl.vim b/indent/cdl.vim
index 8f9ded85..3f69f349 100644
--- a/indent/cdl.vim
+++ b/indent/cdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cdl.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, 'indent/cdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ch.vim b/indent/ch.vim
index 023fff0a..0b606769 100644
--- a/indent/ch.vim
+++ b/indent/ch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ch.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, 'indent/ch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/chaiscript.vim b/indent/chaiscript.vim
index 367f462c..967f4ce0 100644
--- a/indent/chaiscript.vim
+++ b/indent/chaiscript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/chaiscript.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, 'indent/chaiscript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 2b06814c..c2dd0cdc 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/clojure.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, 'indent/clojure.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cmake.vim b/indent/cmake.vim
index dd7cd9b4..30af204e 100644
--- a/indent/cmake.vim
+++ b/indent/cmake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cmake.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, 'indent/cmake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cobol.vim b/indent/cobol.vim
index 9d17a6f7..e09bc85b 100644
--- a/indent/cobol.vim
+++ b/indent/cobol.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cobol.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, 'indent/cobol.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/coffee.vim b/indent/coffee.vim
index 790bc2ce..dca66e4e 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/coffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/config.vim b/indent/config.vim
index 73d5c09c..4a500a02 100644
--- a/indent/config.vim
+++ b/indent/config.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/crystal.vim b/indent/crystal.vim
index 3c554a3f..c405f358 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cs.vim b/indent/cs.vim
index fd8f49de..dad26529 100644
--- a/indent/cs.vim
+++ b/indent/cs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cs.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, 'indent/cs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/css.vim b/indent/css.vim
index 5b8dc7d2..33131747 100644
--- a/indent/css.vim
+++ b/indent/css.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/css.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, 'indent/css.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index a564e254..52fad848 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cucumber.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, 'indent/cucumber.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cuda.vim b/indent/cuda.vim
index 69684363..c878c472 100644
--- a/indent/cuda.vim
+++ b/indent/cuda.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cuda.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, 'indent/cuda.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cython.vim b/indent/cython.vim
index 39bc24da..c8b0e997 100644
--- a/indent/cython.vim
+++ b/indent/cython.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cython.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, 'indent/cython.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/d.vim b/indent/d.vim
index 8fff519e..7a0a195d 100644
--- a/indent/d.vim
+++ b/indent/d.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/d.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, 'indent/d.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dart.vim b/indent/dart.vim
index 87b3bbef..aa9d99f9 100644
--- a/indent/dart.vim
+++ b/indent/dart.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/dart.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dictconf.vim b/indent/dictconf.vim
index d2035d80..478d2b4c 100644
--- a/indent/dictconf.vim
+++ b/indent/dictconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dictconf.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, 'indent/dictconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dictdconf.vim b/indent/dictdconf.vim
index 891334e9..fc948939 100644
--- a/indent/dictdconf.vim
+++ b/indent/dictdconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dictdconf.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, 'indent/dictdconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dosbatch.vim b/indent/dosbatch.vim
index 1baee719..60949dda 100644
--- a/indent/dosbatch.vim
+++ b/indent/dosbatch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dosbatch.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, 'indent/dosbatch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dtd.vim b/indent/dtd.vim
index 9c035ee5..7dfe14db 100644
--- a/indent/dtd.vim
+++ b/indent/dtd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dtd.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, 'indent/dtd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dune.vim b/indent/dune.vim
index a0b2c3c3..563ed198 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dune.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, 'indent/dune.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dylan.vim b/indent/dylan.vim
index 39fc5830..f5a9c835 100644
--- a/indent/dylan.vim
+++ b/indent/dylan.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dylan.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, 'indent/dylan.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ecrystal.vim b/indent/ecrystal.vim
index 8bd3580e..2bca7b1b 100644
--- a/indent/ecrystal.vim
+++ b/indent/ecrystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/ecrystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/eelixir.vim b/indent/eelixir.vim
index cf0b5461..f45af493 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/eelixir.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, 'indent/eelixir.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/elixir.vim b/indent/elixir.vim
index 762516c7..a2854f17 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/elixir.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, 'indent/elixir.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/elm.vim b/indent/elm.vim
index a29a253e..731f8f87 100644
--- a/indent/elm.vim
+++ b/indent/elm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/elm.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, 'indent/elm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index 46595215..de519c34 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ember-script.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, 'indent/ember-script.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/emblem.vim b/indent/emblem.vim
index ba4673b1..7653e6fb 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/emblem.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, 'indent/emblem.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 537b52f5..b66ccd59 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/erlang.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, 'indent/erlang.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/eruby.vim b/indent/eruby.vim
index 16f4b8f5..7ba4bf52 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/eruby.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, 'indent/eruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/eterm.vim b/indent/eterm.vim
index 87a3cd89..e0b391ef 100644
--- a/indent/eterm.vim
+++ b/indent/eterm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/eterm.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, 'indent/eterm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/falcon.vim b/indent/falcon.vim
index 388a508c..bdd716a2 100644
--- a/indent/falcon.vim
+++ b/indent/falcon.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/falcon.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, 'indent/falcon.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/fennel.vim b/indent/fennel.vim
index 9a85f3b2..cddb5827 100644
--- a/indent/fennel.vim
+++ b/indent/fennel.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/fennel.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, 'indent/fennel.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/fish.vim b/indent/fish.vim
index a5e2ab07..f62375fb 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/fish.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/fortran.vim b/indent/fortran.vim
index f56af8ee..cb00f26d 100644
--- a/indent/fortran.vim
+++ b/indent/fortran.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/fortran.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, 'indent/fortran.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/framescript.vim b/indent/framescript.vim
index ae2a2026..de80fd70 100644
--- a/indent/framescript.vim
+++ b/indent/framescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/framescript.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, 'indent/framescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/fsharp.vim b/indent/fsharp.vim
index e743cfb3..cb4af8cc 100644
--- a/indent/fsharp.vim
+++ b/indent/fsharp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/fsharp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/gdscript3.vim b/indent/gdscript3.vim
index f481ef71..7fb7c84f 100644
--- a/indent/gdscript3.vim
+++ b/indent/gdscript3.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/gdscript3.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, 'indent/gdscript3.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index 4eb4b0e7..8155b3c7 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/gitconfig.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, 'indent/gitconfig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/gitolite.vim b/indent/gitolite.vim
index 6a990ec6..d0f3e820 100644
--- a/indent/gitolite.vim
+++ b/indent/gitolite.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/gitolite.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, 'indent/gitolite.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/glsl.vim b/indent/glsl.vim
index 34437a03..442db43d 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/glsl.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, 'indent/glsl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/go.vim b/indent/go.vim
index 2ab79143..a70243ad 100644
--- a/indent/go.vim
+++ b/indent/go.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/go.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, 'indent/go.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/gohtmltmpl.vim b/indent/gohtmltmpl.vim
index f389cf35..ca2ad060 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/gohtmltmpl.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, 'indent/gohtmltmpl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/graphql.vim b/indent/graphql.vim
index 6612527b..713381cb 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/graphql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/haml.vim b/indent/haml.vim
index 3b00ccb2..8597f60d 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/haml.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, 'indent/haml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/hamster.vim b/indent/hamster.vim
index 0ec5252f..2edb2e73 100644
--- a/indent/hamster.vim
+++ b/indent/hamster.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/hamster.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, 'indent/hamster.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
index 77780ef7..a2a9e4e3 100644
--- a/indent/handlebars.vim
+++ b/indent/handlebars.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/handlebars.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, 'indent/handlebars.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/haskell.vim b/indent/haskell.vim
index 5267f3f3..7f4d4a96 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/haskell.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, 'indent/haskell.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/hcl.vim b/indent/hcl.vim
index 7c054c83..e193b83b 100644
--- a/indent/hcl.vim
+++ b/indent/hcl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/hcl.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, 'indent/hcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/hog.vim b/indent/hog.vim
index 1fb5845e..3280d67d 100644
--- a/indent/hog.vim
+++ b/indent/hog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/hog.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, 'indent/hog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/html.vim b/indent/html.vim
index e3cac310..c8922278 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/html.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, 'indent/html.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/htmldjango.vim b/indent/htmldjango.vim
index 17654662..5e3b7fd1 100644
--- a/indent/htmldjango.vim
+++ b/indent/htmldjango.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/htmldjango.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, 'indent/htmldjango.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/idris.vim b/indent/idris.vim
index 97e5386e..f3884f12 100644
--- a/indent/idris.vim
+++ b/indent/idris.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/idris.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, 'indent/idris.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/idris2.vim b/indent/idris2.vim
index 0870c3b8..f2ea6e31 100644
--- a/indent/idris2.vim
+++ b/indent/idris2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/idris2.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, 'indent/idris2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/j.vim b/indent/j.vim
index fdf4df81..dbea206c 100644
--- a/indent/j.vim
+++ b/indent/j.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/j.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, 'indent/j.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/java.vim b/indent/java.vim
index 67bdec6f..06a20d7a 100644
--- a/indent/java.vim
+++ b/indent/java.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/java.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, 'indent/java.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/javascript.vim b/indent/javascript.vim
index bb19347c..65acc8df 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/javascript.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, 'indent/javascript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/json.vim b/indent/json.vim
index 62da1d7b..71b269e7 100644
--- a/indent/json.vim
+++ b/indent/json.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/json.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/jsp.vim b/indent/jsp.vim
index cb7dd66c..0cbfc2ee 100644
--- a/indent/jsp.vim
+++ b/indent/jsp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/jsp.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, 'indent/jsp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/jst.vim b/indent/jst.vim
index 006bcf20..4920d6d7 100644
--- a/indent/jst.vim
+++ b/indent/jst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/jst.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, 'indent/jst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/julia.vim b/indent/julia.vim
index 8b65d4a9..2db6faba 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/julia.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index fca5e30d..fdb8891c 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/kotlin.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, 'indent/kotlin.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ld.vim b/indent/ld.vim
index 6b153d3b..9d671e54 100644
--- a/indent/ld.vim
+++ b/indent/ld.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ld.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, 'indent/ld.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ledger.vim b/indent/ledger.vim
index 6cb48155..a79be9c1 100644
--- a/indent/ledger.vim
+++ b/indent/ledger.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/ledger.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/less.vim b/indent/less.vim
index 4c71822a..45276bea 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/less.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, 'indent/less.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/lifelines.vim b/indent/lifelines.vim
index f6c540f6..3da037d1 100644
--- a/indent/lifelines.vim
+++ b/indent/lifelines.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/lifelines.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, 'indent/lifelines.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
index ec62de55..792ffbbf 100644
--- a/indent/lilypond.vim
+++ b/indent/lilypond.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/lilypond.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, 'indent/lilypond.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/liquid.vim b/indent/liquid.vim
index b922e162..5c0ba020 100644
--- a/indent/liquid.vim
+++ b/indent/liquid.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/liquid.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, 'indent/liquid.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/lisp.vim b/indent/lisp.vim
index 466928dc..d920cf9e 100644
--- a/indent/lisp.vim
+++ b/indent/lisp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/lisp.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, 'indent/lisp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/litcoffee.vim b/indent/litcoffee.vim
index b75f93ac..c7d3d29b 100644
--- a/indent/litcoffee.vim
+++ b/indent/litcoffee.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/litcoffee.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, 'indent/litcoffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/llvm.vim b/indent/llvm.vim
index 34443080..d57b3a12 100644
--- a/indent/llvm.vim
+++ b/indent/llvm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/llvm.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, 'indent/llvm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/logtalk.vim b/indent/logtalk.vim
index 437de863..843dcc23 100644
--- a/indent/logtalk.vim
+++ b/indent/logtalk.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/logtalk.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, 'indent/logtalk.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ls.vim b/indent/ls.vim
index fe959f3e..41ebcac5 100644
--- a/indent/ls.vim
+++ b/indent/ls.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ls.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, 'indent/ls.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/lua.vim b/indent/lua.vim
index e86c1b8d..f4bc40f0 100644
--- a/indent/lua.vim
+++ b/indent/lua.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/lua.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, 'indent/lua.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/mail.vim b/indent/mail.vim
index ff3f67a9..462bd947 100644
--- a/indent/mail.vim
+++ b/indent/mail.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/mail.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, 'indent/mail.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/make.vim b/indent/make.vim
index 66553b2b..f7aabdc5 100644
--- a/indent/make.vim
+++ b/indent/make.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/make.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, 'indent/make.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/mako.vim b/indent/mako.vim
index 12dc3f0d..27a09b05 100644
--- a/indent/mako.vim
+++ b/indent/mako.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/mako.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, 'indent/mako.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/markdown.vim b/indent/markdown.vim
index 927e5ed7..0e0ff248 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/markdown.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, 'indent/markdown.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/meson.vim b/indent/meson.vim
index 26dd22c3..6e055c7f 100644
--- a/indent/meson.vim
+++ b/indent/meson.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/meson.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, 'indent/meson.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/mf.vim b/indent/mf.vim
index 4bf6501e..a0158dd1 100644
--- a/indent/mf.vim
+++ b/indent/mf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/mf.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, 'indent/mf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/moon.vim b/indent/moon.vim
index 202d2de6..d5c55ec4 100644
--- a/indent/moon.vim
+++ b/indent/moon.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/moon.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, 'indent/moon.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/mp.vim b/indent/mp.vim
index d48e8ac4..45f15f64 100644
--- a/indent/mp.vim
+++ b/indent/mp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/mp.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, 'indent/mp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/mustache.vim b/indent/mustache.vim
index 05c58d36..f546461c 100644
--- a/indent/mustache.vim
+++ b/indent/mustache.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/mustache.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, 'indent/mustache.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/nginx.vim b/indent/nginx.vim
index 1dd748d1..c797da45 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/nginx.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, 'indent/nginx.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/nim.vim b/indent/nim.vim
index c4cc7e98..9a3e62f3 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/nim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/nix.vim b/indent/nix.vim
index 7b3f3def..15465a0e 100644
--- a/indent/nix.vim
+++ b/indent/nix.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/nix.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, 'indent/nix.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/nsis.vim b/indent/nsis.vim
index d6aef5c0..61b29b4a 100644
--- a/indent/nsis.vim
+++ b/indent/nsis.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/nsis.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, 'indent/nsis.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index 1d4e2f66..d7a89a61 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ocaml.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, 'indent/ocaml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/occam.vim b/indent/occam.vim
index 06c9face..d6fefc76 100644
--- a/indent/occam.vim
+++ b/indent/occam.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/occam.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, 'indent/occam.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/octave.vim b/indent/octave.vim
index ce6c6952..f15e6745 100644
--- a/indent/octave.vim
+++ b/indent/octave.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/octave.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, 'indent/octave.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/odin.vim b/indent/odin.vim
index 6cd93a9a..5c94c67d 100644
--- a/indent/odin.vim
+++ b/indent/odin.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/odin.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, 'indent/odin.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/omake.vim b/indent/omake.vim
index b5cc828c..87ace177 100644
--- a/indent/omake.vim
+++ b/indent/omake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/omake.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, 'indent/omake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/opencl.vim b/indent/opencl.vim
index 5c30574b..6914df5f 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/opencl.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, 'indent/opencl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pascal.vim b/indent/pascal.vim
index 92177246..f07cb0e4 100644
--- a/indent/pascal.vim
+++ b/indent/pascal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/pascal.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, 'indent/pascal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/perl.vim b/indent/perl.vim
index d40e3629..4c671bc3 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/perl.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, 'indent/perl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pgsql.vim b/indent/pgsql.vim
index a0ece225..ac967355 100644
--- a/indent/pgsql.vim
+++ b/indent/pgsql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/pgsql.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, 'indent/pgsql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index 414ea989..c0f3065b 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/plantuml.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, 'indent/plantuml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pony.vim b/indent/pony.vim
index 32a4c107..51f668de 100644
--- a/indent/pony.vim
+++ b/indent/pony.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/pony.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/postscr.vim b/indent/postscr.vim
index 1f8e563c..89797648 100644
--- a/indent/postscr.vim
+++ b/indent/postscr.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/postscr.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, 'indent/postscr.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pov.vim b/indent/pov.vim
index 747a2135..1964b7b8 100644
--- a/indent/pov.vim
+++ b/indent/pov.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/pov.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, 'indent/pov.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/prolog.vim b/indent/prolog.vim
index e4eb14dc..cb97bf86 100644
--- a/indent/prolog.vim
+++ b/indent/prolog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/prolog.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, 'indent/prolog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/proto.vim b/indent/proto.vim
index d932d146..8bf58362 100644
--- a/indent/proto.vim
+++ b/indent/proto.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/proto.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, 'indent/proto.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ps1.vim b/indent/ps1.vim
index da13602a..92222de8 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ps1.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, 'indent/ps1.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pug.vim b/indent/pug.vim
index 175abe39..d0aadb62 100644
--- a/indent/pug.vim
+++ b/indent/pug.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/pug.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, 'indent/pug.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/puppet.vim b/indent/puppet.vim
index 8a536690..321bf9f8 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/puppet.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, 'indent/puppet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/purescript.vim b/indent/purescript.vim
index fb83604d..fc6e2a26 100644
--- a/indent/purescript.vim
+++ b/indent/purescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/purescript.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, 'indent/purescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pyrex.vim b/indent/pyrex.vim
index 9440efeb..061b71a8 100644
--- a/indent/pyrex.vim
+++ b/indent/pyrex.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/pyrex.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, 'indent/pyrex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/python.vim b/indent/python.vim
index 8128d26c..8e2ea0d7 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/python.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, 'indent/python.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/qml.vim b/indent/qml.vim
index 5d02a475..944e72f2 100644
--- a/indent/qml.vim
+++ b/indent/qml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/qml.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, 'indent/qml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/racket.vim b/indent/racket.vim
index 966bb8ce..626dde52 100644
--- a/indent/racket.vim
+++ b/indent/racket.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/racket.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, 'indent/racket.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/raku.vim b/indent/raku.vim
index ef3976af..052693cf 100644
--- a/indent/raku.vim
+++ b/indent/raku.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/raku.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, 'indent/raku.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/razor.vim b/indent/razor.vim
index 8465fb7f..e35688e4 100644
--- a/indent/razor.vim
+++ b/indent/razor.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/razor.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, 'indent/razor.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/readline.vim b/indent/readline.vim
index 9aa70349..53ef6f21 100644
--- a/indent/readline.vim
+++ b/indent/readline.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/readline.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, 'indent/readline.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/reason.vim b/indent/reason.vim
index 11a6c4e0..490cdeaf 100644
--- a/indent/reason.vim
+++ b/indent/reason.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/reason.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, 'indent/reason.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rmd.vim b/indent/rmd.vim
index e52686b4..d95e442a 100644
--- a/indent/rmd.vim
+++ b/indent/rmd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/rmd.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, 'indent/rmd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rnoweb.vim b/indent/rnoweb.vim
index 54e7dab2..4473d32d 100644
--- a/indent/rnoweb.vim
+++ b/indent/rnoweb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/rnoweb.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, 'indent/rnoweb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rpl.vim b/indent/rpl.vim
index bc674b4d..f5df9afb 100644
--- a/indent/rpl.vim
+++ b/indent/rpl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/rpl.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, 'indent/rpl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rrst.vim b/indent/rrst.vim
index 32fd82d3..5b3187b6 100644
--- a/indent/rrst.vim
+++ b/indent/rrst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/rrst.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, 'indent/rrst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rst.vim b/indent/rst.vim
index 82e6a812..2585df03 100644
--- a/indent/rst.vim
+++ b/indent/rst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/rst.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, 'indent/rst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ruby.vim b/indent/ruby.vim
index 37363d9f..56a348a7 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ruby.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, 'indent/ruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rust.vim b/indent/rust.vim
index 69fdb078..7f0fff27 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/rust.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sas.vim b/indent/sas.vim
index 4eac68cb..671e213c 100644
--- a/indent/sas.vim
+++ b/indent/sas.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sas.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, 'indent/sas.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sass.vim b/indent/sass.vim
index d59a1aba..b3002bef 100644
--- a/indent/sass.vim
+++ b/indent/sass.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sass.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, 'indent/sass.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/scala.vim b/indent/scala.vim
index f29f80b8..62d67720 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/scala.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, 'indent/scala.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/scheme.vim b/indent/scheme.vim
index 1524ce88..2e0c747b 100644
--- a/indent/scheme.vim
+++ b/indent/scheme.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/scheme.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, 'indent/scheme.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/scss.vim b/indent/scss.vim
index c955aeb9..8d302d30 100644
--- a/indent/scss.vim
+++ b/indent/scss.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/scss.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, 'indent/scss.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sdl.vim b/indent/sdl.vim
index eb6b783f..3083b048 100644
--- a/indent/sdl.vim
+++ b/indent/sdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sdl.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, 'indent/sdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/slim.vim b/indent/slim.vim
index 5c10c83c..742834e0 100644
--- a/indent/slim.vim
+++ b/indent/slim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/slim.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, 'indent/slim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/slime.vim b/indent/slime.vim
index 366ad4e0..77b902a2 100644
--- a/indent/slime.vim
+++ b/indent/slime.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/slime.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, 'indent/slime.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sml.vim b/indent/sml.vim
index b1d15bc1..f36bac6c 100644
--- a/indent/sml.vim
+++ b/indent/sml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sml.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, 'indent/sml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/solidity.vim b/indent/solidity.vim
index a3c9b45d..638a3239 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/solidity.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, 'indent/solidity.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sql.vim b/indent/sql.vim
index 49b2a638..82667f5a 100644
--- a/indent/sql.vim
+++ b/indent/sql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sql.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, 'indent/sql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sshconfig.vim b/indent/sshconfig.vim
index a0d7f7d2..aedb0218 100644
--- a/indent/sshconfig.vim
+++ b/indent/sshconfig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sshconfig.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, 'indent/sshconfig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/stylus.vim b/indent/stylus.vim
index 584f4de5..c89dafb3 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/stylus.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, 'indent/stylus.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/svelte.vim b/indent/svelte.vim
index 00e65db6..599023a0 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/svelte.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, 'indent/svelte.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/svg.vim b/indent/svg.vim
index 5bf84360..2057c3ef 100644
--- a/indent/svg.vim
+++ b/indent/svg.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/svg.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, 'indent/svg.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/swift.vim b/indent/swift.vim
index dc09cc5d..48efb354 100644
--- a/indent/swift.vim
+++ b/indent/swift.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/swift.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, 'indent/swift.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/systemverilog.vim b/indent/systemverilog.vim
index 015a60dd..a5c423b2 100644
--- a/indent/systemverilog.vim
+++ b/indent/systemverilog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/systemverilog.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, 'indent/systemverilog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/tcl.vim b/indent/tcl.vim
index be81acbd..0eedaa29 100644
--- a/indent/tcl.vim
+++ b/indent/tcl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/tcl.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, 'indent/tcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/teraterm.vim b/indent/teraterm.vim
index c55127b6..c0e6d131 100644
--- a/indent/teraterm.vim
+++ b/indent/teraterm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/teraterm.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, 'indent/teraterm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/terraform.vim b/indent/terraform.vim
index d0358e3d..9639d47c 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/terraform.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/tex.vim b/indent/tex.vim
index 71aea3f3..4da631a2 100644
--- a/indent/tex.vim
+++ b/indent/tex.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/tex.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, 'indent/tex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/tf.vim b/indent/tf.vim
index 0f388869..096b1977 100644
--- a/indent/tf.vim
+++ b/indent/tf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/tf.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, 'indent/tf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/tilde.vim b/indent/tilde.vim
index 30551dd3..b412a64b 100644
--- a/indent/tilde.vim
+++ b/indent/tilde.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/tilde.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, 'indent/tilde.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/treetop.vim b/indent/treetop.vim
index 1c565846..01b80d68 100644
--- a/indent/treetop.vim
+++ b/indent/treetop.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/treetop.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, 'indent/treetop.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/twig.vim b/indent/twig.vim
index 0f52b6b0..d9472ea4 100644
--- a/indent/twig.vim
+++ b/indent/twig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/twig.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, 'indent/twig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/typescript.vim b/indent/typescript.vim
index 53f716d2..a9577906 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/typescript.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, 'indent/typescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/typescriptreact.vim b/indent/typescriptreact.vim
index 52bb0eda..a89ae88d 100644
--- a/indent/typescriptreact.vim
+++ b/indent/typescriptreact.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/typescriptreact.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, 'indent/typescriptreact.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vala.vim b/indent/vala.vim
index ecf4cc29..cbcfbf2c 100644
--- a/indent/vala.vim
+++ b/indent/vala.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vala.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, 'indent/vala.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vb.vim b/indent/vb.vim
index d4eaa2ec..5e37b74e 100644
--- a/indent/vb.vim
+++ b/indent/vb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vb.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, 'indent/vb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/velocity.vim b/indent/velocity.vim
index 43015f06..ba1344bf 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/velocity.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, 'indent/velocity.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/verilog.vim b/indent/verilog.vim
index 9e6fcddc..02ed70a2 100644
--- a/indent/verilog.vim
+++ b/indent/verilog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/verilog.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, 'indent/verilog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vhdl.vim b/indent/vhdl.vim
index 55e8974a..c129a763 100644
--- a/indent/vhdl.vim
+++ b/indent/vhdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vhdl.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, 'indent/vhdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vlang.vim b/indent/vlang.vim
index bfff3d37..c5b9660a 100644
--- a/indent/vlang.vim
+++ b/indent/vlang.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vlang.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, 'indent/vlang.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vroom.vim b/indent/vroom.vim
index 40ee746b..832019d3 100644
--- a/indent/vroom.vim
+++ b/indent/vroom.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vroom.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, 'indent/vroom.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vue.vim b/indent/vue.vim
index 41b8051b..e53a528b 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vue.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, 'indent/vue.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/wast.vim b/indent/wast.vim
index 870874c6..52cb7ab6 100644
--- a/indent/wast.vim
+++ b/indent/wast.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/wast.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, 'indent/wast.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/xf86conf.vim b/indent/xf86conf.vim
index 7d1ccbe4..7932c428 100644
--- a/indent/xf86conf.vim
+++ b/indent/xf86conf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/xf86conf.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, 'indent/xf86conf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/xhtml.vim b/indent/xhtml.vim
index 2f95f592..7134ac81 100644
--- a/indent/xhtml.vim
+++ b/indent/xhtml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/xhtml.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, 'indent/xhtml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/xinetd.vim b/indent/xinetd.vim
index 2056eb50..e2898b2d 100644
--- a/indent/xinetd.vim
+++ b/indent/xinetd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/xinetd.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, 'indent/xinetd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/xsd.vim b/indent/xsd.vim
index bb0051f1..685f44e1 100644
--- a/indent/xsd.vim
+++ b/indent/xsd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/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, 'indent/xsd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/xslt.vim b/indent/xslt.vim
index f8660431..d111bfba 100644
--- a/indent/xslt.vim
+++ b/indent/xslt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/xslt.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, 'indent/xslt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/yacc.vim b/indent/yacc.vim
index c42be8bd..c4b16402 100644
--- a/indent/yacc.vim
+++ b/indent/yacc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/yacc.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, 'indent/yacc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/yaml.vim b/indent/yaml.vim
index 7bb1c7da..3fb7dcc9 100644
--- a/indent/yaml.vim
+++ b/indent/yaml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/yaml.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, 'indent/yaml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/zig.vim b/indent/zig.vim
index 3ce6b88c..3f9d590f 100644
--- a/indent/zig.vim
+++ b/indent/zig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/zig.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, 'indent/zig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/zimbu.vim b/indent/zimbu.vim
index 593a6557..987b4727 100644
--- a/indent/zimbu.vim
+++ b/indent/zimbu.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/zimbu.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, 'indent/zimbu.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
author	Adam Stankiewicz <sheerun@sher.pl>	2020-10-24 23:50:54 +0200
committer	Adam Stankiewicz <sheerun@sher.pl>	2020-10-24 23:50:54 +0200
commit	d73c4d156279bfbc2ea9fafcbacca5fc2bd6cfd1 (patch)
tree	02e5ede89ee8e6066dc8c4e11033c8ec1684a1dc /indent
parent	20b31f533764c4c32582124de8d8a6f6c9499c8a (diff)
download	vim-polyglot-d73c4d156279bfbc2ea9fafcbacca5fc2bd6cfd1.tar.gz vim-polyglot-d73c4d156279bfbc2ea9fafcbacca5fc2bd6cfd1.zip