Improve guard to support concatenated files

53 files changed, 106 insertions, 212 deletions

diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index dfaa66fe..19a759a2 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Support for LaTex-to-Unicode conversion as in the Julia REPL "
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -652,3 +649,4 @@ function! LaTeXtoUnicode#Toggle()
   endif
   return
 endfunction
+endif
diff --git a/autoload/RstFold.vim b/autoload/RstFold.vim
index 1f53d67f..4d865808 100644
--- a/autoload/RstFold.vim
+++ b/autoload/RstFold.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rst') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 " Author: Antony Lee <anntzer.lee@gmail.com>
 " Description: Helper functions for reStructuredText syntax folding
 " Last Modified: 2018-12-29
@@ -64,3 +61,4 @@ function RstFold#GetRstFoldText()
   let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline
   return indent . text
 endfunction
+endif
diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index fe28ef3a..ea63bd7a 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 function! cargo#Load() 
     " Utility call to get this script loaded, for debugging
 endfunction
@@ -117,3 +114,4 @@ function! cargo#runtarget(args)
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index ac66d298..b108da2f 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 function! cargo#quickfix#CmdPre() abort
     if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo'
         " Preserve the current directory, and 'lcd' to the nearest Cargo file.
@@ -28,3 +25,4 @@ function! cargo#quickfix#CmdPost() abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index b8dc71c9..88aacd74 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 " Vim completion script
 " Language:     Clojure
 " Maintainer:   Sung Pae <self@sungpae.com>
@@ -24,3 +21,4 @@ function! clojurecomplete#Complete(findstart, base)
 endfunction
 
 " vim:sts=8:sw=8:ts=8:noet
+endif
diff --git a/autoload/coffee.vim b/autoload/coffee.vim
index beeed729..b308f4c1 100644
--- a/autoload/coffee.vim
+++ b/autoload/coffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -56,3 +53,4 @@ function! coffee#CoffeeSetUpErrorFormat()
                          \%f:%l:%c:\ error:\ %m,
                          \%-G%.%#
 endfunction
+endif
diff --git a/autoload/crystal_lang.vim b/autoload/crystal_lang.vim
index 56221246..2acfdb76 100644
--- a/autoload/crystal_lang.vim
+++ b/autoload/crystal_lang.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:save_cpo = &cpo
 set cpo&vim
 
@@ -342,3 +339,4 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
+endif
diff --git a/autoload/csv.vim b/autoload/csv.vim
index dcca5e81..66fc6a17 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'csv') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csv') == -1
 " Filetype plugin for editing CSV files. "{{{1
 " Author:  Christian Brabandt <cb@256bit.org>
 " Version: 0.31
@@ -3189,3 +3186,4 @@ endfun
 
 " Vim Modeline " {{{2
 " vim: set foldmethod=marker et sw=0 sts=-1 ts=4:
+endif
diff --git a/autoload/dart.vim b/autoload/dart.vim
index 82859463..39ebc9e3 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 
 function! s:error(text) abort
   echohl Error
@@ -186,3 +183,4 @@ function! dart#setModifiable() abort
     setlocal nomodifiable
   endif
 endfunction
+endif
diff --git a/autoload/db/adapter/ecto.vim b/autoload/db/adapter/ecto.vim
index 54ee3396..e8e543ba 100644
--- a/autoload/db/adapter/ecto.vim
+++ b/autoload/db/adapter/ecto.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 let s:path = expand('<sfile>:h')
 let s:cmd = join(['mix', 'run', '--no-start', '--no-compile', shellescape(s:path.'/get_repos.exs')])
 
@@ -22,3 +19,4 @@ endfunction
 function! db#adapter#ecto#complete_opaque(url) abort
     return map(s:repo_list(), 'v:val[0]')
 endfunction
+endif
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index 74d7344c..2924f0e6 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if !exists("g:elixir_indent_max_lookbehind")
   let g:elixir_indent_max_lookbehind = 30
 endif
@@ -363,3 +360,4 @@ function! elixir#indent#handle_inside_generic_block(context)
     return -1
   endif
 endfunction
+endif
diff --git a/autoload/elixir/util.vim b/autoload/elixir/util.vim
index f02e1b87..d6b6541a 100644
--- a/autoload/elixir/util.vim
+++ b/autoload/elixir/util.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 function! elixir#util#get_filename(word) abort
   let word = a:word
 
@@ -26,3 +23,4 @@ function! elixir#util#get_filename(word) abort
 
   return word
 endfunction
+endif
diff --git a/autoload/elm.vim b/autoload/elm.vim
index d58ddaab..46ada03b 100644
--- a/autoload/elm.vim
+++ b/autoload/elm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 let s:errors = []
 
 function! s:elmOracle(...) abort
@@ -383,3 +380,4 @@ function! s:ExecuteInRoot(cmd) abort
 
 	return l:out
 endfunction
+endif
diff --git a/autoload/elm/util.vim b/autoload/elm/util.vim
index 6d1014e0..cd509cc1 100644
--- a/autoload/elm/util.vim
+++ b/autoload/elm/util.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 " IsWin returns 1 if current OS is Windows or 0 otherwise
 fun! elm#util#IsWin() abort
   let l:win = ['win16', 'win32', 'win32unix', 'win64', 'win95']
@@ -182,3 +179,4 @@ function! s:error(msg)
 	echohl NONE
 	let v:errmsg = a:msg
 endfunction
+endif
diff --git a/autoload/fish.vim b/autoload/fish.vim
index 5b86736e..2ad976d7 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 function! fish#Indent()
     let l:shiftwidth = shiftwidth()
     let l:prevlnum = prevnonblank(v:lnum - 1)
@@ -69,3 +66,4 @@ endfunction
 function! fish#errorformat()
     return '%Afish: %m,%-G%*\\ ^,%-Z%f (line %l):%s'
 endfunction
+endif
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index e3f16179..ed03d910 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 " don't spam the user when Vim is started in Vi compatibility mode
 let s:cpo_save = &cpo
 set cpo&vim
@@ -494,3 +491,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/autoload/graphql.vim b/autoload/graphql.vim
index cce43556..85b654ad 100644
--- a/autoload/graphql.vim
+++ b/autoload/graphql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 " Vim plugin
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -14,3 +11,4 @@ let g:autoloaded_graphql = 1
 function! graphql#javascript_tags() abort
   return get(g:, 'graphql_javascript_tags', ['gql', 'graphql', 'Relay.QL'])
 endfunction
+endif
diff --git a/autoload/htmlcomplete.vim b/autoload/htmlcomplete.vim
index ef32c64d..002a6f0e 100644
--- a/autoload/htmlcomplete.vim
+++ b/autoload/htmlcomplete.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim completion script
 " Language:     HTML and XHTML
 " Maintainer:   Mikolaj Machowski ( mikmach AT wp DOT pl )
@@ -843,3 +840,4 @@ function! htmlcomplete#CheckDoctype() " {{{
 endfunction
 " }}}
 " vim:set foldmethod=marker:
+endif
diff --git a/autoload/jsx_pretty/comment.vim b/autoload/jsx_pretty/comment.vim
index 325baaea..932d5535 100644
--- a/autoload/jsx_pretty/comment.vim
+++ b/autoload/jsx_pretty/comment.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 function! jsx_pretty#comment#update_commentstring(original)
   let syn_current = s:syn_name(line('.'), col('.'))
   let syn_start = s:syn_name(line('.'), 1)
@@ -39,3 +36,4 @@ function! s:syn_contains(lnum, cnum, syn_name)
   let syn_names = map(stack, 'synIDattr(v:val, "name")')
   return index(syn_names, a:syn_name) >= 0
 endfunction
+endif
diff --git a/autoload/jsx_pretty/indent.vim b/autoload/jsx_pretty/indent.vim
index 67170b46..4c108416 100644
--- a/autoload/jsx_pretty/indent.vim
+++ b/autoload/jsx_pretty/indent.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 if exists('*shiftwidth')
   function! s:sw()
     return shiftwidth()
@@ -216,3 +213,4 @@ function! jsx_pretty#indent#get(js_indent)
   endif
 
 endfunction
+endif
diff --git a/autoload/julia.vim b/autoload/julia.vim
index c3c949ac..f2fc6123 100644
--- a/autoload/julia.vim
+++ b/autoload/julia.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 function! julia#set_syntax_version(jvers)
   if &filetype != "julia"
     echo "Not a Julia file"
@@ -186,3 +183,4 @@ function! julia#gotodefinition()
 endfunction
 
 endif
+endif
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index c2660143..1dee5aed 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " path to the julia binary to communicate with
 if has('win32') || has('win64')
   if exists('g:julia#doc#juliapath')
@@ -244,3 +241,4 @@ function! s:likely(str) abort
   let output = systemlist(cmd)
   return split(matchstr(output[0], '\C^search: \zs.*'))
 endfunction
+endif
diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index 0f4d2bb0..46b18484 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " Facilities for moving around Julia blocks (e.g. if/end, function/end etc.)
 " (AKA a collection of horrible hacks)
 
@@ -796,3 +793,4 @@ function! s:cursor_moved(...)
   let b:jlblk_did_select = b:jlblk_doing_select
   let b:jlblk_doing_select = 0
 endfunction
+endif
diff --git a/autoload/julia_latex_symbols.vim b/autoload/julia_latex_symbols.vim
index d0daf6fc..51deacc8 100644
--- a/autoload/julia_latex_symbols.vim
+++ b/autoload/julia_latex_symbols.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " This file is autogenerated from the script 'generate_latex_symbols_table.jl'
 " The symbols are based on Julia version 1.3.0-DEV.263
 
@@ -3332,3 +3329,4 @@ function! julia_latex_symbols#get_dict()
     \ '\:baggage_claim:': '🛄',
     \ '\:left_luggage:': '🛅'}
 endfunction
+endif
diff --git a/autoload/pony.vim b/autoload/pony.vim
index fd14136e..52e1981a 100644
--- a/autoload/pony.vim
+++ b/autoload/pony.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 " Vim plugin file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -534,3 +531,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim
index 54a57599..c45bc90f 100644
--- a/autoload/puppet/align.vim
+++ b/autoload/puppet/align.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 function! puppet#align#IndentLevel(lnum)
     return indent(a:lnum) / &shiftwidth
 endfunction
@@ -70,3 +67,4 @@ function! puppet#align#AlignHashrockets(...) abort
         endif
     endfor
 endfunction
+endif
diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim
index 5547f42e..469b1213 100644
--- a/autoload/puppet/ctags.vim
+++ b/autoload/puppet/ctags.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 if !exists('s:ctags_type')
   let s:ctags_type = 0
@@ -38,3 +35,4 @@ function! puppet#ctags#Type()
   return s:ctags_type
 endfunction
 
+endif
diff --git a/autoload/puppet/format.vim b/autoload/puppet/format.vim
index f60bd782..c608f228 100644
--- a/autoload/puppet/format.vim
+++ b/autoload/puppet/format.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 "
 " Simple format using puppet's l:indents and align hashrockets function
 function! puppet#format#Format() abort
@@ -59,3 +56,4 @@ function! puppet#format#Fallback(start_lnum, end_lnum) abort
 
 endfunction
 
+endif
diff --git a/autoload/python/utils.vim b/autoload/python/utils.vim
index 2ae781ae..8a8170d6 100644
--- a/autoload/python/utils.vim
+++ b/autoload/python/utils.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-compiler') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
 " Sometimes Python issues debugging messages
 " which don't belong to a call stack context
 " this function filters these messages
@@ -19,3 +16,4 @@ function! python#utils#fix_qflist() " {{{
     call setqflist(l:traceback)
   endif
 endfunction " }}}
+endif
diff --git a/autoload/rubycomplete.vim b/autoload/rubycomplete.vim
index 3f9a01f9..02a2d014 100644
--- a/autoload/rubycomplete.vim
+++ b/autoload/rubycomplete.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim completion script
 " Language:		Ruby
 " Maintainer:		Mark Guzman <segfault@hasno.info>
@@ -878,3 +875,4 @@ call s:DefRuby()
 "}}} ruby-side code
 
 " vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:
+endif
diff --git a/autoload/rust.vim b/autoload/rust.vim
index 7aff515b..1051c842 100644
--- a/autoload/rust.vim
+++ b/autoload/rust.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Author: Kevin Ballard
 " Description: Helper functions for Rust commands/mappings
 " Last Modified: May 27, 2014
@@ -548,3 +545,4 @@ endfunction
 " }}}1
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index 6392a024..40a691c3 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
 
 let s:global_variable_list = [
@@ -105,3 +102,4 @@ function! rust#debugging#InfoToFile(filename) abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index 5e599f6a..8d88a8f4 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 let s:delimitMate_extra_excluded_regions = ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
 
 " For this buffer, when delimitMate issues the `User delimitMate_map`
@@ -46,3 +43,4 @@ endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
 
+endif
diff --git a/autoload/rust/tags.vim b/autoload/rust/tags.vim
index 74e2f9f0..d3a3e645 100644
--- a/autoload/rust/tags.vim
+++ b/autoload/rust/tags.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Tagbar support code, for the sake of not automatically overriding its
 " configuration in case Universal Ctags is detected.
 
@@ -19,3 +16,4 @@ function! rust#tags#IsUCtags() abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index f469ac13..4118eef4 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Author: Stephen Sugden <stephen@stephensugden.com>
 "
 " Adapted from https://github.com/fatih/vim-go
@@ -264,3 +261,4 @@ endfunction
 
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/autoload/smt2.vim b/autoload/smt2.vim
index fd87febe..655e0d3f 100644
--- a/autoload/smt2.vim
+++ b/autoload/smt2.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'smt2') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1
 " Invokes the solver on current file
 function! smt2#RunSolver()
     silent !clear
@@ -32,3 +29,4 @@ function! smt2#PrintSolverVersion()
     silent !clear
     execute "!" . g:smt2_solver_command . " " . g:smt2_solver_version_switch
 endfunction
+endif
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index 8554022e..7ddfd9d1 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 function! terraform#fmt()
   if !filereadable(expand('%:p'))
     return
@@ -58,3 +55,4 @@ function! terraform#commands(A, L, P)
   \ 'state'
   \ ]
 endfunction
+endif
diff --git a/autoload/vifm/edit.vim b/autoload/vifm/edit.vim
index c92baeeb..c19155a9 100644
--- a/autoload/vifm/edit.vim
+++ b/autoload/vifm/edit.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
 " common functions for vifm command-line editing buffer filetype plugins
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: August 18, 2013
@@ -16,3 +13,4 @@ function! vifm#edit#Init()
     " Start buffer editing in insert mode
     startinsert
 endfunction
+endif
diff --git a/autoload/vifm/globals.vim b/autoload/vifm/globals.vim
index 74b49a04..f7ae6a98 100644
--- a/autoload/vifm/globals.vim
+++ b/autoload/vifm/globals.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
 " common functions for vifm plugin related to globals
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: November 03, 2018
@@ -33,3 +30,4 @@ function! vifm#globals#Init()
         let g:vifm_embed_term = has('gui_running')
     endif
 endfunction
+endif
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
diff --git a/autoload/xml/aria.vim b/autoload/xml/aria.vim
index 40fbfc69..6d2d1a01 100644
--- a/autoload/xml/aria.vim
+++ b/autoload/xml/aria.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim completion for WAI-ARIA data file
 " Language:       HTML + WAI-ARIA
 " Maintainer:     othree <othree@gmail.com>
@@ -459,3 +456,4 @@ let g:xmldata_aria = {
     \ 'default_role': default_role,
     \ 'vimariaattrinfo': aria_attributes_value
 \ }
+endif
diff --git a/autoload/xml/html5.vim b/autoload/xml/html5.vim
index 60ce2460..a8ab04dc 100644
--- a/autoload/xml/html5.vim
+++ b/autoload/xml/html5.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim completion for HTML5 data file
 " Language:	    HTML (version 5.1 Draft 2016 Jan 13)
 " Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
@@ -872,3 +869,4 @@ let g:xmldata_html5 = {
     \ 'wbr': ['/>', ''],
 \ },
 \ }
+endif
diff --git a/autoload/zig/config.vim b/autoload/zig/config.vim
index 9a87fa1c..f208af45 100644
--- a/autoload/zig/config.vim
+++ b/autoload/zig/config.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'zig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 function! zig#config#ListTypeCommands() abort
   return get(g:, 'zig_list_type_commands', {})
 endfunction
@@ -41,3 +38,4 @@ endfunction
 function! zig#config#Debug() abort
   return get(g:, 'zig_debug', [])
 endfunction
+endif
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index cc7862c7..47c49cd4 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'zig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 " Adapted from fatih/vim-go: autoload/go/fmt.vim
 "
 " Copyright 2011 The Go Authors. All rights reserved.
@@ -168,3 +165,4 @@ function! zig#fmt#ToggleFmtAutoSave() abort
 endfunction
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/autoload/zig/list.vim b/autoload/zig/list.vim
index 97ebf47f..9716e8c9 100644
--- a/autoload/zig/list.vim
+++ b/autoload/zig/list.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'zig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 " Adapted from fatih/vim-go: autoload/go/list.vim
 "
 " Copyright 2011 The Go Authors. All rights reserved.
@@ -160,3 +157,4 @@ function! zig#list#Type(for) abort
 endfunction
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/autoload/zig/util.vim b/autoload/zig/util.vim
index bb2df40c..8545d48b 100644
--- a/autoload/zig/util.vim
+++ b/autoload/zig/util.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'zig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 " Adapted from vim-go: autoload/go/util.vim
 "
 " Copyright 2011 The Go Authors. All rights reserved.
@@ -392,3 +389,4 @@ function! zig#util#HasDebug(flag)
 endfunction
 
 " vim: sw=2 ts=2 et
+endif