From 45a7512dea0599efaf96e8a2cad3fac7be61cf5d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 25 Oct 2020 20:33:44 +0100
Subject: Preserve loading order of plugins, fixes #608

---
 after/ftplugin/cabal.vim           | 2 +-
 after/ftplugin/coffee.vim          | 2 +-
 after/ftplugin/haskell.vim         | 2 +-
 after/ftplugin/html.vim            | 2 +-
 after/ftplugin/idris.vim           | 2 +-
 after/ftplugin/idris2.vim          | 2 +-
 after/ftplugin/javascript-1.vim    | 2 +-
 after/ftplugin/javascript-2.vim    | 2 +-
 after/ftplugin/javascriptreact.vim | 2 +-
 after/ftplugin/jsx.vim             | 2 +-
 after/ftplugin/llvm.vim            | 2 +-
 after/ftplugin/puppet.vim          | 2 +-
 after/ftplugin/tsx.vim             | 2 +-
 after/ftplugin/typescriptreact.vim | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'after/ftplugin')

diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 461f6a24..80757d8e 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index a039dd95..f6a750f6 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cjsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cjsx')
   finish
 endif
 
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 96ea4d04..03446e8b 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim
index 6b0b48a2..ab2a8f2b 100644
--- a/after/ftplugin/html.vim
+++ b/after/ftplugin/html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/ftplugin/idris.vim b/after/ftplugin/idris.vim
index 4b38f4ce..1b973639 100644
--- a/after/ftplugin/idris.vim
+++ b/after/ftplugin/idris.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/after/ftplugin/idris2.vim b/after/ftplugin/idris2.vim
index b7f25573..55a57ff2 100644
--- a/after/ftplugin/idris2.vim
+++ b/after/ftplugin/idris2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-1.vim b/after/ftplugin/javascript-1.vim
index 8480c6e7..4ffa2117 100644
--- a/after/ftplugin/javascript-1.vim
+++ b/after/ftplugin/javascript-1.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-2.vim b/after/ftplugin/javascript-2.vim
index f56dd82a..5a311439 100644
--- a/after/ftplugin/javascript-2.vim
+++ b/after/ftplugin/javascript-2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/javascriptreact.vim b/after/ftplugin/javascriptreact.vim
index be2ea1fc..a757cdd7 100644
--- a/after/ftplugin/javascriptreact.vim
+++ b/after/ftplugin/javascriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index f6f07131..02451a80 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim
index 192bf2f5..84402199 100644
--- a/after/ftplugin/llvm.vim
+++ b/after/ftplugin/llvm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 8cbc9972..64b1699b 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/after/ftplugin/tsx.vim b/after/ftplugin/tsx.vim
index 2b35ec46..8c687fa6 100644
--- a/after/ftplugin/tsx.vim
+++ b/after/ftplugin/tsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/typescriptreact.vim b/after/ftplugin/typescriptreact.vim
index 07de9bb7..75f2e3bb 100644
--- a/after/ftplugin/typescriptreact.vim
+++ b/after/ftplugin/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
-- 
cgit v1.2.3