Fix loading for vim 8 packages, closes #613

38 files changed, 38 insertions, 38 deletions

diff --git a/compiler/ant.vim b/compiler/ant.vim
index 8d038e0b..c46491f8 100644
--- a/compiler/ant.vim
+++ b/compiler/ant.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ant')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ant', 'compiler/ant.vim')
   finish
 endif
 
diff --git a/compiler/bdf.vim b/compiler/bdf.vim
index 915c2d70..997d685b 100644
--- a/compiler/bdf.vim
+++ b/compiler/bdf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bdf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bdf', 'compiler/bdf.vim')
   finish
 endif
 
diff --git a/compiler/cake.vim b/compiler/cake.vim
index 0f0d9c1e..a761282c 100644
--- a/compiler/cake.vim
+++ b/compiler/cake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coffee-script')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coffee-script', 'compiler/cake.vim')
   finish
 endif
 
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index 8b6ee453..d56612f2 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'compiler/cargo.vim')
   finish
 endif
 
diff --git a/compiler/coffee.vim b/compiler/coffee.vim
index d73b850b..28aff34e 100644
--- a/compiler/coffee.vim
+++ b/compiler/coffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coffee-script')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coffee-script', 'compiler/coffee.vim')
   finish
 endif
 
diff --git a/compiler/credo.vim b/compiler/credo.vim
index 1cfe5cda..ca7bfc22 100644
--- a/compiler/credo.vim
+++ b/compiler/credo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'compiler/credo.vim')
   finish
 endif
 
diff --git a/compiler/cryptol.vim b/compiler/cryptol.vim
index cb6b72f9..2855c0da 100644
--- a/compiler/cryptol.vim
+++ b/compiler/cryptol.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cryptol')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cryptol', 'compiler/cryptol.vim')
   finish
 endif
 
diff --git a/compiler/cs.vim b/compiler/cs.vim
index 0bbc12b4..5b34a437 100644
--- a/compiler/cs.vim
+++ b/compiler/cs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cs', 'compiler/cs.vim')
   finish
 endif
 
diff --git a/compiler/cucumber.vim b/compiler/cucumber.vim
index 831f0a4a..e43f553a 100644
--- a/compiler/cucumber.vim
+++ b/compiler/cucumber.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cucumber')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cucumber', 'compiler/cucumber.vim')
   finish
 endif
 
diff --git a/compiler/dot.vim b/compiler/dot.vim
index 63e1d552..3773f89a 100644
--- a/compiler/dot.vim
+++ b/compiler/dot.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dot')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dot', 'compiler/dot.vim')
   finish
 endif
 
diff --git a/compiler/eruby.vim b/compiler/eruby.vim
index c576858c..bd5a16d0 100644
--- a/compiler/eruby.vim
+++ b/compiler/eruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'compiler/eruby.vim')
   finish
 endif
 
diff --git a/compiler/exunit.vim b/compiler/exunit.vim
index 6921850a..6381308f 100644
--- a/compiler/exunit.vim
+++ b/compiler/exunit.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'compiler/exunit.vim')
   finish
 endif
 
diff --git a/compiler/fish.vim b/compiler/fish.vim
index e46699b6..7684db47 100644
--- a/compiler/fish.vim
+++ b/compiler/fish.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fish')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fish', 'compiler/fish.vim')
   finish
 endif
 
diff --git a/compiler/gleam.vim b/compiler/gleam.vim
index 808a869a..6a63fa19 100644
--- a/compiler/gleam.vim
+++ b/compiler/gleam.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gleam')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gleam', 'compiler/gleam.vim')
   finish
 endif
 
diff --git a/compiler/go.vim b/compiler/go.vim
index 01c7fe0a..3333caee 100644
--- a/compiler/go.vim
+++ b/compiler/go.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'compiler/go.vim')
   finish
 endif
 
diff --git a/compiler/gradle.vim b/compiler/gradle.vim
index 3b40fb18..6a52af1b 100644
--- a/compiler/gradle.vim
+++ b/compiler/gradle.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gradle')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gradle', 'compiler/gradle.vim')
   finish
 endif
 
diff --git a/compiler/gradlew.vim b/compiler/gradlew.vim
index 12a24d99..22048a92 100644
--- a/compiler/gradlew.vim
+++ b/compiler/gradlew.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gradle')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gradle', 'compiler/gradlew.vim')
   finish
 endif
 
diff --git a/compiler/haml.vim b/compiler/haml.vim
index 03ae7776..83fd2970 100644
--- a/compiler/haml.vim
+++ b/compiler/haml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haml', 'compiler/haml.vim')
   finish
 endif
 
diff --git a/compiler/ledger.vim b/compiler/ledger.vim
index 18731a00..92348ba3 100644
--- a/compiler/ledger.vim
+++ b/compiler/ledger.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ledger')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ledger', 'compiler/ledger.vim')
   finish
 endif
 
diff --git a/compiler/lilypond.vim b/compiler/lilypond.vim
index d70b60ff..60a1c52b 100644
--- a/compiler/lilypond.vim
+++ b/compiler/lilypond.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lilypond')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'compiler/lilypond.vim')
   finish
 endif
 
diff --git a/compiler/ls.vim b/compiler/ls.vim
index b3cdb32f..f23539aa 100644
--- a/compiler/ls.vim
+++ b/compiler/ls.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'livescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'livescript', 'compiler/ls.vim')
   finish
 endif
 
diff --git a/compiler/mix.vim b/compiler/mix.vim
index 0563f8ee..cb7902ee 100644
--- a/compiler/mix.vim
+++ b/compiler/mix.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'compiler/mix.vim')
   finish
 endif
 
diff --git a/compiler/nim.vim b/compiler/nim.vim
index edfa730e..f88e7d88 100644
--- a/compiler/nim.vim
+++ b/compiler/nim.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nim', 'compiler/nim.vim')
   finish
 endif
 
diff --git a/compiler/nix-build.vim b/compiler/nix-build.vim
index 5049e4e4..7c39a4a0 100644
--- a/compiler/nix-build.vim
+++ b/compiler/nix-build.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nix')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nix', 'compiler/nix-build.vim')
   finish
 endif
 
diff --git a/compiler/ocaml.vim b/compiler/ocaml.vim
index d8650017..3ad94741 100644
--- a/compiler/ocaml.vim
+++ b/compiler/ocaml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'compiler/ocaml.vim')
   finish
 endif
 
diff --git a/compiler/powershell.vim b/compiler/powershell.vim
index edfa1ec9..0ba5776c 100644
--- a/compiler/powershell.vim
+++ b/compiler/powershell.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'powershell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'powershell', 'compiler/powershell.vim')
   finish
 endif
 
diff --git a/compiler/python.vim b/compiler/python.vim
index e7caa465..b71b6a88 100644
--- a/compiler/python.vim
+++ b/compiler/python.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'python-compiler')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'python-compiler', 'compiler/python.vim')
   finish
 endif
 
diff --git a/compiler/rake.vim b/compiler/rake.vim
index 9557fc9a..84e312e8 100644
--- a/compiler/rake.vim
+++ b/compiler/rake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'compiler/rake.vim')
   finish
 endif
 
diff --git a/compiler/rspec.vim b/compiler/rspec.vim
index 2b16684a..19f41ade 100644
--- a/compiler/rspec.vim
+++ b/compiler/rspec.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'compiler/rspec.vim')
   finish
 endif
 
diff --git a/compiler/ruby.vim b/compiler/ruby.vim
index 96a54615..c0299d7e 100644
--- a/compiler/ruby.vim
+++ b/compiler/ruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'compiler/ruby.vim')
   finish
 endif
 
diff --git a/compiler/rubyunit.vim b/compiler/rubyunit.vim
index eb443f03..f1049612 100644
--- a/compiler/rubyunit.vim
+++ b/compiler/rubyunit.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'compiler/rubyunit.vim')
   finish
 endif
 
diff --git a/compiler/rustc.vim b/compiler/rustc.vim
index 0a093541..8c950bf0 100644
--- a/compiler/rustc.vim
+++ b/compiler/rustc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'compiler/rustc.vim')
   finish
 endif
 
diff --git a/compiler/sass.vim b/compiler/sass.vim
index 7d1e9876..b4bbcc3b 100644
--- a/compiler/sass.vim
+++ b/compiler/sass.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sass')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sass', 'compiler/sass.vim')
   finish
 endif
 
diff --git a/compiler/sbt.vim b/compiler/sbt.vim
index 32cf3f26..a7ab9da7 100644
--- a/compiler/sbt.vim
+++ b/compiler/sbt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scala', 'compiler/sbt.vim')
   finish
 endif
 
diff --git a/compiler/swift.vim b/compiler/swift.vim
index cd19a7e8..f832c9de 100644
--- a/compiler/swift.vim
+++ b/compiler/swift.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'swift')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'swift', 'compiler/swift.vim')
   finish
 endif
 
diff --git a/compiler/tcl.vim b/compiler/tcl.vim
index d562da46..c48d197a 100644
--- a/compiler/tcl.vim
+++ b/compiler/tcl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tcl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tcl', 'compiler/tcl.vim')
   finish
 endif
 
diff --git a/compiler/tidy.vim b/compiler/tidy.vim
index 5ebe6e37..fec701da 100644
--- a/compiler/tidy.vim
+++ b/compiler/tidy.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tidy')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tidy', 'compiler/tidy.vim')
   finish
 endif
 
diff --git a/compiler/typescript.vim b/compiler/typescript.vim
index e5ec6dfb..43380d27 100644
--- a/compiler/typescript.vim
+++ b/compiler/typescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'compiler/typescript.vim')
   finish
 endif