8 files changed, 16 insertions, 32 deletions
diff --git a/autoload/vital/_crystal.vim b/autoload/vital/_crystal.vim
index d2c1b560..08972e34 100644
--- a/autoload/vital/_crystal.vim
+++ b/autoload/vital/_crystal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 let s:_plugin_name = expand('<sfile>:t:r')
 
 function! vital#{s:_plugin_name}#new() abort
@@ -11,3 +8,4 @@ endfunction
 function! vital#{s:_plugin_name}#function(funcname) abort
   silent! return function(a:funcname)
 endfunction
+endif
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim
index 54c7927b..de55e0e6 100644
--- a/autoload/vital/_crystal/ColorEcho.vim
+++ b/autoload/vital/_crystal/ColorEcho.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -189,3 +186,4 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
+endif
diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim
index 7c83136b..8595fa53 100644
--- a/autoload/vital/_crystal/Data/List.vim
+++ b/autoload/vital/_crystal/Data/List.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -466,3 +463,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
+endif
diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim
index 2f822225..e8c72a47 100644
--- a/autoload/vital/_crystal/Data/String.vim
+++ b/autoload/vital/_crystal/Data/String.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -629,3 +626,4 @@ endfunction
 let &cpo = s:save_cpo
 unlet s:save_cpo
 " vim:set et ts=2 sts=2 sw=2 tw=0:
+endif
diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim
index 2ea6d584..5f19af55 100644
--- a/autoload/vital/_crystal/Process.vim
+++ b/autoload/vital/_crystal/Process.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -175,3 +172,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
+endif
diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim
index 39bfd724..ef9cd5e9 100644
--- a/autoload/vital/_crystal/Web/JSON.vim
+++ b/autoload/vital/_crystal/Web/JSON.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -180,3 +177,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
+endif
diff --git a/autoload/vital/crystal.vim b/autoload/vital/crystal.vim
index 15e7487b..f5858108 100644
--- a/autoload/vital/crystal.vim
+++ b/autoload/vital/crystal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 let s:plugin_name = expand('<sfile>:t:r')
 let s:vital_base_dir = expand('<sfile>:h')
 let s:project_root = expand('<sfile>:h:h:h')
@@ -330,3 +327,4 @@ else
     return a:list
   endfunction
 endif
+endif
diff --git a/autoload/vital/crystal.vital b/autoload/vital/crystal.vital
index 3deaa053..19e5f642 100644
--- a/autoload/vital/crystal.vital
+++ b/autoload/vital/crystal.vital
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 crystal
 bee84ae23effb0510137ad177e98c94d8b3657a6
 
 Process
 Web.JSON
 ColorEcho
+endif