Fix loading for vim 8 packages, closes #613

15 files changed, 15 insertions, 15 deletions

diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 387e655b..c81fedb6 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haskell', 'after/ftplugin/cabal.vim')
   finish
 endif
 
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index b01a8a08..528fbeaa 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cjsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cjsx', 'after/ftplugin/coffee.vim')
   finish
 endif
 
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 75117f1b..21cf2690 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haskell', 'after/ftplugin/haskell.vim')
   finish
 endif
 
diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim
index 6cbec0ad..5a6b963e 100644
--- a/after/ftplugin/html.vim
+++ b/after/ftplugin/html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/ftplugin/html.vim')
   finish
 endif
 
diff --git a/after/ftplugin/idris.vim b/after/ftplugin/idris.vim
index 3fa7a746..f10e518c 100644
--- a/after/ftplugin/idris.vim
+++ b/after/ftplugin/idris.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris', 'after/ftplugin/idris.vim')
   finish
 endif
 
diff --git a/after/ftplugin/idris2.vim b/after/ftplugin/idris2.vim
index 2572f2af..466101e7 100644
--- a/after/ftplugin/idris2.vim
+++ b/after/ftplugin/idris2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris2', 'after/ftplugin/idris2.vim')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-1.vim b/after/ftplugin/javascript-1.vim
index 58e2e1f6..5d6f0d0c 100644
--- a/after/ftplugin/javascript-1.vim
+++ b/after/ftplugin/javascript-1.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javascript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javascript', 'after/ftplugin/javascript.vim')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-2.vim b/after/ftplugin/javascript-2.vim
index 67a63055..9abbda2f 100644
--- a/after/ftplugin/javascript-2.vim
+++ b/after/ftplugin/javascript-2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/javascript-2.vim')
   finish
 endif
 
diff --git a/after/ftplugin/javascriptreact.vim b/after/ftplugin/javascriptreact.vim
index ceacc887..494e6d6e 100644
--- a/after/ftplugin/javascriptreact.vim
+++ b/after/ftplugin/javascriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/javascriptreact.vim')
   finish
 endif
 
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index 54ebd29f..e1af589f 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/jsx.vim')
   finish
 endif
 
diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim
index 19835810..bb1ee63e 100644
--- a/after/ftplugin/llvm.vim
+++ b/after/ftplugin/llvm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'llvm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'after/ftplugin/llvm.vim')
   finish
 endif
 
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 2e3f9c7d..e530bff4 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'after/ftplugin/puppet.vim')
   finish
 endif
 
diff --git a/after/ftplugin/tex.vim b/after/ftplugin/tex.vim
index 0fcb47a8..e2898321 100644
--- a/after/ftplugin/tex.vim
+++ b/after/ftplugin/tex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tex', 'after/ftplugin/tex.vim')
   finish
 endif
 
diff --git a/after/ftplugin/tsx.vim b/after/ftplugin/tsx.vim
index 3d4226d1..d8d93c8a 100644
--- a/after/ftplugin/tsx.vim
+++ b/after/ftplugin/tsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/tsx.vim')
   finish
 endif
 
diff --git a/after/ftplugin/typescriptreact.vim b/after/ftplugin/typescriptreact.vim
index 3c3b2666..ec114d96 100644
--- a/after/ftplugin/typescriptreact.vim
+++ b/after/ftplugin/typescriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/typescriptreact.vim')
   finish
 endif