Fix loading for vim 8 packages, closes #613

11 files changed, 11 insertions, 11 deletions

diff --git a/after/indent/html.vim b/after/indent/html.vim
index ea76ee09..67728aac 100644
--- a/after/indent/html.vim
+++ b/after/indent/html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/indent/html.vim')
   finish
 endif
 
diff --git a/after/indent/javascript-1.vim b/after/indent/javascript-1.vim
index 67a63055..ca9e143f 100644
--- a/after/indent/javascript-1.vim
+++ b/after/indent/javascript-1.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/javascript.vim')
   finish
 endif
 
diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim
index 3a9fe380..ad32e284 100644
--- a/after/indent/javascript-2.vim
+++ b/after/indent/javascript-2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/javascript-2.vim')
   finish
 endif
 
diff --git a/after/indent/javascriptreact.vim b/after/indent/javascriptreact.vim
index ceacc887..994c195b 100644
--- a/after/indent/javascriptreact.vim
+++ b/after/indent/javascriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/javascriptreact.vim')
   finish
 endif
 
diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim
index afee5bf0..24c4a096 100644
--- a/after/indent/jsx.vim
+++ b/after/indent/jsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/jsx.vim')
   finish
 endif
 
diff --git a/after/indent/objc.vim b/after/indent/objc.vim
index e9cc20e8..c84f43b3 100644
--- a/after/indent/objc.vim
+++ b/after/indent/objc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'objc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'objc', 'after/indent/objc.vim')
   finish
 endif
 
diff --git a/after/indent/php.vim b/after/indent/php.vim
index f64a7c6c..65534a8c 100644
--- a/after/indent/php.vim
+++ b/after/indent/php.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/php.vim')
   finish
 endif
 
diff --git a/after/indent/tex.vim b/after/indent/tex.vim
index 4cd17b84..cbb4f01b 100644
--- a/after/indent/tex.vim
+++ b/after/indent/tex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tex', 'after/indent/tex.vim')
   finish
 endif
 
diff --git a/after/indent/tsx.vim b/after/indent/tsx.vim
index 18254bfc..4ff59991 100644
--- a/after/indent/tsx.vim
+++ b/after/indent/tsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/tsx.vim')
   finish
 endif
 
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
index 6d27bc70..ba107504 100644
--- a/after/indent/typescript.vim
+++ b/after/indent/typescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/typescript.vim')
   finish
 endif
 
diff --git a/after/indent/typescriptreact.vim b/after/indent/typescriptreact.vim
index 3c3b2666..4a530b9d 100644
--- a/after/indent/typescriptreact.vim
+++ b/after/indent/typescriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/typescriptreact.vim')
   finish
 endif