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

---
 scripts/build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts/build')

diff --git a/scripts/build b/scripts/build
index 7d069d94..f6910e72 100755
--- a/scripts/build
+++ b/scripts/build
@@ -295,7 +295,7 @@ def copy_file(name, src, dest)
     open(dest, "w") do |output|
       if dest.match?(/\.vim$/)
         output << <<~EOF
-        if !polyglot#util#IsEnabled('#{name}', expand('<sfile>:p'))
+        if !has_key(g:polyglot_is_disabled, '#{name}')
           finish
         endif
 
@@ -674,7 +674,7 @@ def generate_ftdetect(packages, heuristics)
     end
 
     if package_autocommands.flatten.size > 0
-      output << "if polyglot#util#IsEnabled('#{package["name"]}', 'ftdetect')\n"
+      output << "if !has_key(g:polyglot_is_disabled, '#{package["name"]}')\n"
       output << indent(package_autocommands.map { |pc| pc.reverse.join("\n") }.join("\n\n"), 2)
       output << "\nendif\n\n"
     end
-- 
cgit v1.2.3