From 48e07bc5014fecfdff24f75124a65634c216c9e2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 6 Sep 2019 15:54:31 +0200
Subject: Improve guard to support concatenated files

---
 ftplugin/Dockerfile.vim         | 6 ++----
 ftplugin/ansible.vim            | 6 ++----
 ftplugin/ansible_hosts.vim      | 6 ++----
 ftplugin/blade.vim              | 6 ++----
 ftplugin/caddyfile.vim          | 6 ++----
 ftplugin/clojure.vim            | 6 ++----
 ftplugin/coffee.vim             | 6 ++----
 ftplugin/cryptol/folding.vim    | 6 ++----
 ftplugin/crystal.vim            | 6 ++----
 ftplugin/csv.vim                | 6 ++----
 ftplugin/cucumber.vim           | 6 ++----
 ftplugin/dart.vim               | 6 ++----
 ftplugin/dhall.vim              | 6 ++----
 ftplugin/docker-compose.vim     | 6 ++----
 ftplugin/eelixir.vim            | 6 ++----
 ftplugin/elixir.vim             | 6 ++----
 ftplugin/elm.vim                | 6 ++----
 ftplugin/elm/tagbar.vim         | 6 ++----
 ftplugin/ember-script.vim       | 6 ++----
 ftplugin/emblem.vim             | 6 ++----
 ftplugin/eruby.vim              | 6 ++----
 ftplugin/fish.vim               | 6 ++----
 ftplugin/git.vim                | 6 ++----
 ftplugin/gitcommit.vim          | 6 ++----
 ftplugin/gitconfig.vim          | 6 ++----
 ftplugin/gitrebase.vim          | 6 ++----
 ftplugin/gitsendemail.vim       | 6 ++----
 ftplugin/graphql.vim            | 6 ++----
 ftplugin/haml.vim               | 6 ++----
 ftplugin/hcl.vim                | 6 ++----
 ftplugin/hive.vim               | 6 ++----
 ftplugin/html.vim               | 6 ++----
 ftplugin/i3config.vim           | 6 ++----
 ftplugin/idris.vim              | 6 ++----
 ftplugin/ion.vim                | 6 ++----
 ftplugin/jbuild.vim             | 6 ++----
 ftplugin/json.vim               | 6 ++----
 ftplugin/julia.vim              | 6 ++----
 ftplugin/juliadoc.vim           | 6 ++----
 ftplugin/kotlin.vim             | 6 ++----
 ftplugin/latex-box/common.vim   | 6 ++----
 ftplugin/latex-box/complete.vim | 6 ++----
 ftplugin/latex-box/findmain.vim | 6 ++----
 ftplugin/latex-box/folding.vim  | 6 ++----
 ftplugin/latex-box/latexmk.vim  | 6 ++----
 ftplugin/latex-box/mappings.vim | 6 ++----
 ftplugin/latex-box/motion.vim   | 6 ++----
 ftplugin/latextoc.vim           | 6 ++----
 ftplugin/less.vim               | 6 ++----
 ftplugin/lilypond.vim           | 6 ++----
 ftplugin/litcoffee.vim          | 6 ++----
 ftplugin/llvm.vim               | 6 ++----
 ftplugin/ls.vim                 | 6 ++----
 ftplugin/mail_vifm.vim          | 6 ++----
 ftplugin/mako.vim               | 6 ++----
 ftplugin/meson.vim              | 6 ++----
 ftplugin/mma.vim                | 6 ++----
 ftplugin/moon.vim               | 6 ++----
 ftplugin/mustache.vim           | 6 ++----
 ftplugin/nginx.vim              | 6 ++----
 ftplugin/nix.vim                | 6 ++----
 ftplugin/oasis.vim              | 6 ++----
 ftplugin/objc.vim               | 6 ++----
 ftplugin/ocaml.vim              | 6 ++----
 ftplugin/ocamlbuild_tags.vim    | 6 ++----
 ftplugin/omake.vim              | 6 ++----
 ftplugin/opencl.vim             | 6 ++----
 ftplugin/perl.vim               | 6 ++----
 ftplugin/plantuml.vim           | 6 ++----
 ftplugin/pony.vim               | 6 ++----
 ftplugin/ps1.vim                | 6 ++----
 ftplugin/ps1xml.vim             | 6 ++----
 ftplugin/pug.vim                | 6 ++----
 ftplugin/puppet.vim             | 6 ++----
 ftplugin/puppet_tagbar.vim      | 6 ++----
 ftplugin/purescript.vim         | 6 ++----
 ftplugin/qml.vim                | 6 ++----
 ftplugin/racket.vim             | 6 ++----
 ftplugin/raml.vim               | 6 ++----
 ftplugin/rst.vim                | 6 ++----
 ftplugin/ruby.vim               | 6 ++----
 ftplugin/rust.vim               | 6 ++----
 ftplugin/rust/tagbar.vim        | 6 ++----
 ftplugin/scala.vim              | 6 ++----
 ftplugin/scala.xpt.vim          | 6 ++----
 ftplugin/scala/tagbar.vim       | 6 ++----
 ftplugin/scss.vim               | 6 ++----
 ftplugin/sexplib.vim            | 6 ++----
 ftplugin/slim.vim               | 6 ++----
 ftplugin/smt2.vim               | 6 ++----
 ftplugin/solidity.vim           | 6 ++----
 ftplugin/stylus.vim             | 6 ++----
 ftplugin/swift.vim              | 6 ++----
 ftplugin/tablegen.vim           | 6 ++----
 ftplugin/terraform.vim          | 6 ++----
 ftplugin/tex_LatexBox.vim       | 6 ++----
 ftplugin/textile.vim            | 6 ++----
 ftplugin/tmux.vim               | 6 ++----
 ftplugin/toml.vim               | 6 ++----
 ftplugin/tsx.vim                | 6 ++----
 ftplugin/tt2html.vim            | 6 ++----
 ftplugin/twig.vim               | 6 ++----
 ftplugin/typescript.vim         | 6 ++----
 ftplugin/vifm-cmdedit.vim       | 6 ++----
 ftplugin/vifm-edit.vim          | 6 ++----
 ftplugin/vifm-rename.vim        | 6 ++----
 ftplugin/vifm.vim               | 6 ++----
 ftplugin/vue.vim                | 6 ++----
 ftplugin/xs.vim                 | 6 ++----
 ftplugin/zig.vim                | 6 ++----
 110 files changed, 220 insertions(+), 440 deletions(-)

(limited to 'ftplugin')

diff --git a/ftplugin/Dockerfile.vim b/ftplugin/Dockerfile.vim
index 977be845..f1335d79 100644
--- a/ftplugin/Dockerfile.vim
+++ b/ftplugin/Dockerfile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 " Define comment string
 setlocal commentstring=#\ %s
 
@@ -35,3 +32,4 @@ inoreabbr <silent> <buffer> workdir <C-R>=DockerfileReplaceInstruction("workdir"
 inoreabbr <silent> <buffer> arg <C-R>=DockerfileReplaceInstruction("arg", "ARG")<CR>
 inoreabbr <silent> <buffer> onbuild <C-R>=DockerfileReplaceInstruction("onbuild", "ONBUILD")<CR>
 inoreabbr <silent> <buffer> stopsignal <C-R>=DockerfileReplaceInstruction("stopsignal", "STOPSIGNAL")<CR>
+endif
diff --git a/ftplugin/ansible.vim b/ftplugin/ansible.vim
index 491cd803..7ee5166a 100644
--- a/ftplugin/ansible.vim
+++ b/ftplugin/ansible.vim
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 " Slow yaml highlighting workaround
 if exists('+regexpengine') && ('&regexpengine' == 0)
   setlocal regexpengine=1
 endif
 set isfname+=@-@
 set path+=./../templates,./../files,templates,files
+endif
diff --git a/ftplugin/ansible_hosts.vim b/ftplugin/ansible_hosts.vim
index 8b3fbe93..e2ecc4b3 100644
--- a/ftplugin/ansible_hosts.vim
+++ b/ftplugin/ansible_hosts.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 if exists("b:did_ftplugin")
   finish
 else
@@ -11,3 +8,4 @@ endif
 setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions-=c
 
 let b:undo_ftplugin = "setl comments< commentstring< formatoptions<"
+endif
diff --git a/ftplugin/blade.vim b/ftplugin/blade.vim
index cbc8513a..a5f98824 100644
--- a/ftplugin/blade.vim
+++ b/ftplugin/blade.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'blade') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 " Vim filetype plugin
 " Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
@@ -35,3 +32,4 @@ if exists('loaded_matchit') && exists('b:match_words')
     let b:match_skip = 'synIDattr(synID(line("."), col("."), 0), "name") !=# "bladeKeyword"'
     let b:match_ignorecase = 0
 endif
+endif
diff --git a/ftplugin/caddyfile.vim b/ftplugin/caddyfile.vim
index 1339ca94..a90e010d 100644
--- a/ftplugin/caddyfile.vim
+++ b/ftplugin/caddyfile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'caddyfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 " Language:	    Caddyfile
 " Author:	    Josh Glendenning <josh@isobit.io>
 
@@ -26,3 +23,4 @@ else
 	let g:NERDCustomDelimiters = {'caddyfile': s:delimiters}
 endif
 unlet s:delimiters
+endif
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 0ed94392..0563e066 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.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 filetype plugin file
 " Language:     Clojure
 " Author:       Meikel Brandmeyer <mb@kotka.de>
@@ -97,3 +94,4 @@ let &cpo = s:cpo_save
 unlet! s:cpo_save s:setting s:dir
 
 " vim:sts=8:sw=8:ts=8:noet
+endif
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim
index 7084424e..2ccafc1f 100644
--- a/ftplugin/coffee.vim
+++ b/ftplugin/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
@@ -407,3 +404,4 @@ command! -buffer -range=% -bar -nargs=* CoffeeRun
 \        call s:CoffeeRun(<line1>, <line2>, <q-args>)
 command! -buffer -range=% -bang -bar -nargs=* CoffeeLint
 \        call s:CoffeeLint(<line1>, <line2>, <q-bang>, <q-args>)
+endif
diff --git a/ftplugin/cryptol/folding.vim b/ftplugin/cryptol/folding.vim
index a74c8bc4..8c70c104 100644
--- a/ftplugin/cryptol/folding.vim
+++ b/ftplugin/cryptol/folding.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cryptol') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
 " Copyright © 2013 Edward O'Callaghan. All Rights Reserved.
 
 "setlocal foldmethod=indent
@@ -48,3 +45,4 @@ function! GetPotionFold(lnum)
         return '>' . next_indent
     endif
 endfunction
+endif
diff --git a/ftplugin/crystal.vim b/ftplugin/crystal.vim
index 8ebdaed8..b6e10338 100644
--- a/ftplugin/crystal.vim
+++ b/ftplugin/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
 if exists('b:did_ftplugin')
   finish
 endif
@@ -82,3 +79,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/ftplugin/csv.vim b/ftplugin/csv.vim
index 2545b37f..ad4c0bec 100644
--- a/ftplugin/csv.vim
+++ b/ftplugin/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
@@ -36,3 +33,4 @@ unlet s:cpo_save
 
 " Vim Modeline " {{{2
 " vim: set foldmethod=marker et sw=0 sts=-1 ts=4:
+endif
diff --git a/ftplugin/cucumber.vim b/ftplugin/cucumber.vim
index a07db5da..cf4c7b78 100644
--- a/ftplugin/cucumber.vim
+++ b/ftplugin/cucumber.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 " Vim filetype plugin
 " Language:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -152,3 +149,4 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:set sts=2 sw=2:
+endif
diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim
index 71114b0a..23b709c0 100644
--- a/ftplugin/dart.vim
+++ b/ftplugin/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
 if exists('b:did_ftplugin')
   finish
 endif
@@ -31,3 +28,4 @@ setlocal includeexpr=dart#resolveUri(v:fname)
 setlocal isfname+=:
 
 let b:undo_ftplugin = 'setl et< fo< sw< sts< com< cms< inex< isf<'
+endif
diff --git a/ftplugin/dhall.vim b/ftplugin/dhall.vim
index 7afad55f..7ce258c5 100644
--- a/ftplugin/dhall.vim
+++ b/ftplugin/dhall.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dhall') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dhall') == -1
 if exists('b:dhall_ftplugin')
 	finish
 endif
@@ -37,3 +34,4 @@ endif
 augroup dhall
     au BufNewFile,BufRead *.dhall setl shiftwidth=2
 augroup END
+endif
diff --git a/ftplugin/docker-compose.vim b/ftplugin/docker-compose.vim
index 45a103fc..44361375 100644
--- a/ftplugin/docker-compose.vim
+++ b/ftplugin/docker-compose.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 " Define comment string
 setlocal commentstring=#\ %s
 
 " Enable automatic comment insertion
 setlocal formatoptions+=cro
+endif
diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index 7c1b2b9c..4575f568 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.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("b:did_ftplugin")
   finish
 endif
@@ -109,3 +106,4 @@ let b:undo_ftplugin = "setl cms< " .
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 let &cpo = s:save_cpo
+endif
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index 5354a6c1..57f5a6f7 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.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('b:did_ftplugin')
   finish
 endif
@@ -53,3 +50,4 @@ onoremap <buffer> <silent> <expr> [] ':silent keeppatterns ?'.b:block_end  .'<CR
 
 let b:undo_ftplugin = 'setlocal sw< sts< et< isk< com< cms< path< inex< sua< def< fo<'.
       \ '| unlet! b:match_ignorecase b:match_words b:block_begin b:block_end'
+endif
diff --git a/ftplugin/elm.vim b/ftplugin/elm.vim
index 04b829d2..9c923b5a 100644
--- a/ftplugin/elm.vim
+++ b/ftplugin/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
 " plugin for Elm (http://elm-lang.org/)
 
 if exists('b:did_ftplugin')
@@ -111,3 +108,4 @@ let &l:path =
 setlocal includeexpr=GetElmFilename(v:fname)
 setlocal include=^\\s*import\\s\\+
 setlocal suffixesadd=.elm
+endif
diff --git a/ftplugin/elm/tagbar.vim b/ftplugin/elm/tagbar.vim
index 4e1ce756..4ae5b10c 100644
--- a/ftplugin/elm/tagbar.vim
+++ b/ftplugin/elm/tagbar.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
 if !executable('ctags')
     finish
 elseif globpath(&runtimepath, 'plugin/tagbar.vim') ==? ''
@@ -22,3 +19,4 @@ function! s:SetTagbar()
 endfunction
 
 call s:SetTagbar()
+endif
diff --git a/ftplugin/ember-script.vim b/ftplugin/ember-script.vim
index 49387198..2846bd12 100644
--- a/ftplugin/ember-script.vim
+++ b/ftplugin/ember-script.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emberscript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
 " URL:         http://github.com/yalesov/vim-ember-script
@@ -23,3 +20,4 @@ else
 endif
 setlocal comments=:#
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/emblem.vim b/ftplugin/emblem.vim
index e3a80a42..eec84036 100644
--- a/ftplugin/emblem.vim
+++ b/ftplugin/emblem.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emblem') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
 " URL:         http://github.com/yalesov/vim-emblem
@@ -19,3 +16,4 @@ setlocal smartindent
 setlocal formatoptions=q
 setlocal comments=:/
 setlocal commentstring=/\ %s
+endif
diff --git a/ftplugin/eruby.vim b/ftplugin/eruby.vim
index 483f40c9..ba813b9e 100644
--- a/ftplugin/eruby.vim
+++ b/ftplugin/eruby.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 filetype plugin
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -133,3 +130,4 @@ function! ErubyAtCursor() abort
 endfunction
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index 3784b4c4..6097e2ab 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/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
 setlocal comments=:#
 setlocal commentstring=#%s
 setlocal define=\\v^\\s*function>
@@ -41,3 +38,4 @@ let b:match_words =
 let b:endwise_addition = 'end'
 let b:endwise_words = 'begin,function,if,switch,while,for'
 let b:endwise_syngroups = 'fishKeyword,fishConditional,fishRepeat'
+endif
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
index 7aca0e5b..6bd9098d 100644
--- a/ftplugin/git.vim
+++ b/ftplugin/git.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim filetype plugin
 " Language:	generic git output
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -43,3 +40,4 @@ endif
 
 setlocal includeexpr=substitute(v:fname,'^[^/]\\+/','','')
 let b:undo_ftplugin = "setl keywordprg< path< includeexpr<"
+endif
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
index 3eb77a67..723b2915 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim filetype plugin
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -68,3 +65,4 @@ function! s:gitdiffcached(bang,gitdir,...)
   nnoremap <buffer> <silent> q :q<CR>
   setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git
 endfunction
+endif
diff --git a/ftplugin/gitconfig.vim b/ftplugin/gitconfig.vim
index 325b771e..0f0d705b 100644
--- a/ftplugin/gitconfig.vim
+++ b/ftplugin/gitconfig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim filetype plugin
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -17,3 +14,4 @@ setlocal formatoptions-=t formatoptions+=croql
 setlocal comments=:#,:; commentstring=;\ %s
 
 let b:undo_ftplugin = "setl fo< com< cms<"
+endif
diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim
index e28d83c0..202f676e 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim filetype plugin
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -47,3 +44,4 @@ endif
 nnoremap <buffer> <expr> K col('.') < 7 && expand('<Lt>cword>') =~ '\X' && getline('.') =~ '^\w\+\s\+\x\+\>' ? 'wK' : 'K'
 
 let b:undo_ftplugin = b:undo_ftplugin . "|nunmap <buffer> K"
+endif
diff --git a/ftplugin/gitsendemail.vim b/ftplugin/gitsendemail.vim
index baf6080e..30aed3f6 100644
--- a/ftplugin/gitsendemail.vim
+++ b/ftplugin/gitsendemail.vim
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim filetype plugin
 " Language:	git send-email message
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Last Change:	2009 Dec 24
 
 runtime! ftplugin/mail.vim
+endif
diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim
index 7734acee..492fe107 100644
--- a/ftplugin/graphql.vim
+++ b/ftplugin/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 filetype plugin
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -20,3 +17,4 @@ setlocal shiftwidth=2
 setlocal expandtab
 
 let b:undo_ftplugin = 'setlocal com< cms< fo< isk< sts< sw< et<'
+endif
diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim
index ddcae644..7fa8efa4 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 " Vim filetype plugin
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -73,3 +70,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set sw=2:
+endif
diff --git a/ftplugin/hcl.vim b/ftplugin/hcl.vim
index c648150c..a48f406b 100644
--- a/ftplugin/hcl.vim
+++ b/ftplugin/hcl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'hcl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 " File: ftplugin/hcl.vim
 " Author: BABAROT <b4b4r07@gmail.com>
 " Description: FileType Plugin for HCL
@@ -39,3 +36,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: set et sw=4 ts=4:
+endif
diff --git a/ftplugin/hive.vim b/ftplugin/hive.vim
index 70daab7d..c7ceb774 100644
--- a/ftplugin/hive.vim
+++ b/ftplugin/hive.vim
@@ -1,6 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'hive') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hive') == -1
 setlocal comments=:--
 setlocal commentstring=--\ %s
+endif
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index 87fed79d..7b856136 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.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
 " Maintainer:  	othree <othree@gmail.com>
 " URL:		      http://github.com/othree/html5.vim
 " Last Change:  2014-05-02
@@ -11,3 +8,4 @@ endif
 " setlocal iskeyword+=-
 
 setlocal commentstring=<!--%s-->
+endif
diff --git a/ftplugin/i3config.vim b/ftplugin/i3config.vim
index 41de3247..f5451e80 100644
--- a/ftplugin/i3config.vim
+++ b/ftplugin/i3config.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'i3') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/idris.vim b/ftplugin/idris.vim
index ce18060d..777b6cfd 100644
--- a/ftplugin/idris.vim
+++ b/ftplugin/idris.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'idris') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 if bufname('%') == "idris-response"
   finish
 endif
@@ -344,3 +341,4 @@ menu Idris.Proof\ Search\ with\ hints <LocalLeader>p
 
 au BufHidden idris-response call IdrisHideResponseWin()
 au BufEnter idris-response call IdrisShowResponseWin()
+endif
diff --git a/ftplugin/ion.vim b/ftplugin/ion.vim
index 7cb349b9..1a056112 100644
--- a/ftplugin/ion.vim
+++ b/ftplugin/ion.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ion') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ion') == -1
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
 
 setlocal commentstring=#%s
+endif
diff --git a/ftplugin/jbuild.vim b/ftplugin/jbuild.vim
index 1ac4801d..628620ad 100644
--- a/ftplugin/jbuild.vim
+++ b/ftplugin/jbuild.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 if exists("b:did_ftplugin")
   finish
 endif
@@ -14,3 +11,4 @@ setl commentstring=;\ %s
 setl comments=:;
 
 setl iskeyword+=#,?,.,/
+endif
diff --git a/ftplugin/json.vim b/ftplugin/json.vim
index 132bea4b..f8185ca5 100644
--- a/ftplugin/json.vim
+++ b/ftplugin/json.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 " Vim syntax file
 " Language:	JSON
 " Maintainer:	Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
@@ -40,3 +37,4 @@ if has('conceal')
 	"maybe g:vim_json_syntax_conceal could be settable to 0,1,2 to map
 	"directly to vim's conceallevels? unsure if anyone cares
 endif
+endif
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index bdfe9877..27930727 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/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
 " Vim filetype plugin file
 " Language:	Julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
@@ -109,3 +106,4 @@ let b:undo_ftplugin .= " | delcommand JuliaDoc | delcommand JuliaDocKeywordprg"
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
+endif
diff --git a/ftplugin/juliadoc.vim b/ftplugin/juliadoc.vim
index b56a45d2..aa21646e 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.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
 " Vim filetype plugin file
 " Language: Julia document
 
@@ -32,3 +29,4 @@ let b:undo_ftplugin .= " | delcommand JuliaDoc | delcommand JuliaDocKeywordprg"
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
+endif
diff --git a/ftplugin/kotlin.vim b/ftplugin/kotlin.vim
index 519a153a..aefa76c9 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'kotlin') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 if exists('b:did_ftplugin') | finish | endif
 let b:did_ftplugin = 1
 
 setlocal comments=://
 setlocal commentstring=//\ %s
+endif
diff --git a/ftplugin/latex-box/common.vim b/ftplugin/latex-box/common.vim
index 1eccacd4..938d97b2 100644
--- a/ftplugin/latex-box/common.vim
+++ b/ftplugin/latex-box/common.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box common functions
 
 " Error Format {{{
@@ -415,3 +412,4 @@ endfunction
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/complete.vim b/ftplugin/latex-box/complete.vim
index 365ea14f..74f98696 100644
--- a/ftplugin/latex-box/complete.vim
+++ b/ftplugin/latex-box/complete.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box completion
 
 setlocal omnifunc=LatexBox_Complete
@@ -934,3 +931,4 @@ command! LatexLabels call <SID>PromptLabelList()
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/findmain.vim b/ftplugin/latex-box/findmain.vim
index a52d745e..a06358b5 100644
--- a/ftplugin/latex-box/findmain.vim
+++ b/ftplugin/latex-box/findmain.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LatexBox_GetMainFileName: gets the name of the main file being compiled. {{{
 " Description:  returns the full path name of the main file.
 "               This function checks for the existence of a .latexmain file
@@ -64,3 +61,4 @@ function! LatexBox_GetMainFileName(...)
 	"       certain platforms.
 	return lheadfile
 endfunction
+endif
diff --git a/ftplugin/latex-box/folding.vim b/ftplugin/latex-box/folding.vim
index 6311ebf2..1dac48d5 100644
--- a/ftplugin/latex-box/folding.vim
+++ b/ftplugin/latex-box/folding.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " Folding support for LaTeX
 
 "
@@ -380,3 +377,4 @@ endfunction
 
 " {{{1 Footer
 " vim:fdm=marker:ff=unix:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/latexmk.vim b/ftplugin/latex-box/latexmk.vim
index bee760a5..c1b917b7 100644
--- a/ftplugin/latex-box/latexmk.vim
+++ b/ftplugin/latex-box/latexmk.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box latexmk functions
 
 " Options and variables {{{
@@ -556,3 +553,4 @@ endif
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/mappings.vim b/ftplugin/latex-box/mappings.vim
index ccfb5d8d..7d2e0633 100644
--- a/ftplugin/latex-box/mappings.vim
+++ b/ftplugin/latex-box/mappings.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box mappings
 
 if exists("g:LatexBox_no_mappings")
@@ -108,3 +105,4 @@ vnoremap <buffer> <silent> [[ :<c-u>call <SID>LatexBoxNextSection(0,1,1)<CR>
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/motion.vim b/ftplugin/latex-box/motion.vim
index b9614d72..9caa0ed5 100644
--- a/ftplugin/latex-box/motion.vim
+++ b/ftplugin/latex-box/motion.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box motion functions
 
 " Motion options {{{
@@ -546,3 +543,4 @@ command! LatexTOCToggle call LatexBox_TOC(1)
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latextoc.vim b/ftplugin/latextoc.vim
index 9553b211..1c4c4953 100644
--- a/ftplugin/latextoc.vim
+++ b/ftplugin/latextoc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " {{{1 Settings
 setlocal buftype=nofile
 setlocal bufhidden=wipe
@@ -204,3 +201,4 @@ nnoremap <buffer> <silent> <Esc>OD h
 " }}}1
 
 " vim:fdm=marker:ff=unix:et:ts=4:sw=4
+endif
diff --git a/ftplugin/less.vim b/ftplugin/less.vim
index 55a282dc..5fb1f5f3 100644
--- a/ftplugin/less.vim
+++ b/ftplugin/less.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 " Vim filetype plugin
 " Language:	    LessCSS
 " Author:	    Tim Pope <vimNOSPAM@tpope.org>
@@ -28,3 +25,4 @@ setlocal fo=croql
 let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='
 
 " vim:set sw=2:
+endif
diff --git a/ftplugin/lilypond.vim b/ftplugin/lilypond.vim
index b755a6bb..a0e1a137 100644
--- a/ftplugin/lilypond.vim
+++ b/ftplugin/lilypond.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lilypond') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 " LilyPond filetype plugin
 " Language:     LilyPond (ft=ly)
 " Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
@@ -59,3 +56,4 @@ setlocal dictionary-=$VIM/syntax/lilypond-words dictionary+=$VIM/syntax/lilypond
 setlocal complete-=k complete+=k
 "
 setlocal showmatch
+endif
diff --git a/ftplugin/litcoffee.vim b/ftplugin/litcoffee.vim
index 9bb4f697..6dfb197c 100644
--- a/ftplugin/litcoffee.vim
+++ b/ftplugin/litcoffee.vim
@@ -1,5 +1,3 @@
-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
 runtime ftplugin/coffee.vim
+endif
diff --git a/ftplugin/llvm.vim b/ftplugin/llvm.vim
index 0006c288..b2c65f4e 100644
--- a/ftplugin/llvm.vim
+++ b/ftplugin/llvm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'llvm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 " Vim filetype plugin file
 " Language: LLVM Assembly
 " Maintainer: The LLVM team, http://llvm.org/
@@ -14,3 +11,4 @@ let b:did_ftplugin = 1
 setlocal softtabstop=2 shiftwidth=2
 setlocal expandtab
 setlocal comments+=:;
+endif
diff --git a/ftplugin/ls.vim b/ftplugin/ls.vim
index a0b86468..b40ca5ea 100644
--- a/ftplugin/ls.vim
+++ b/ftplugin/ls.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 " Language:    LiveScript
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -206,3 +203,4 @@ command! -range=% -bar -nargs=* -complete=customlist,s:LiveScriptCompileComplete
 \        LiveScriptCompile call s:LiveScriptCompile(<line1>, <line2>, <q-args>)
 " Run some LiveScript.
 command! -range=% -bar LiveScriptRun <line1>,<line2>:w !lsc -sp
+endif
diff --git a/ftplugin/mail_vifm.vim b/ftplugin/mail_vifm.vim
index 7da4b3fb..9dc2cbb5 100644
--- a/ftplugin/mail_vifm.vim
+++ b/ftplugin/mail_vifm.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
 " Mail file type extension to pick files for attachments via vifm
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: January 02, 2018
@@ -66,3 +63,4 @@ endfunction
 nnoremap <buffer> <silent> <localleader>a :call <sid>AddMailAttachments()<cr>
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
+endif
diff --git a/ftplugin/mako.vim b/ftplugin/mako.vim
index 1caf0e0c..b20b9593 100644
--- a/ftplugin/mako.vim
+++ b/ftplugin/mako.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mako') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 " Vim filetype plugin file
 " Language:     Mako
 " Maintainer:   Randy Stauner <randy@magnificent-tears.com>
@@ -13,3 +10,4 @@ let b:did_ftplugin = 1
 
 setlocal comments=:##
 setlocal commentstring=##%s
+endif
diff --git a/ftplugin/meson.vim b/ftplugin/meson.vim
index 870f0052..8949b6ee 100644
--- a/ftplugin/meson.vim
+++ b/ftplugin/meson.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'meson') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 " Vim filetype plugin file
 " Language:	meson
 " Original Author:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -17,3 +14,4 @@ setlocal softtabstop=2
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
+endif
diff --git a/ftplugin/mma.vim b/ftplugin/mma.vim
index c1f8a5a3..237f1da8 100644
--- a/ftplugin/mma.vim
+++ b/ftplugin/mma.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mathematica') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
 "Vim filetype plugin
 " Language: Mathematica
 " Maintainer: R. Menon <rsmenon@icloud.com>
@@ -61,3 +58,4 @@ unlet s:cpo_save
 "}
 
 " vim: set foldmarker={,} foldlevel=0 foldmethod=marker:
+endif
diff --git a/ftplugin/moon.vim b/ftplugin/moon.vim
index e8adbf2f..e99de496 100644
--- a/ftplugin/moon.vim
+++ b/ftplugin/moon.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'moonscript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
 " Based On:    CoffeeScript by Mick Koch <kchmck@gmail.com>
@@ -18,3 +15,4 @@ setlocal comments=:--
 setlocal commentstring=--\ %s
 
 let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<"
+endif
diff --git a/ftplugin/mustache.vim b/ftplugin/mustache.vim
index c0eb6221..03889841 100644
--- a/ftplugin/mustache.vim
+++ b/ftplugin/mustache.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'handlebars') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 if exists('b:loaded_mustache_handlebars')
   finish
 endif
@@ -125,3 +122,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nofoldenable
+endif
diff --git a/ftplugin/nginx.vim b/ftplugin/nginx.vim
index 6ba4d016..08f9b340 100644
--- a/ftplugin/nginx.vim
+++ b/ftplugin/nginx.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nginx') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/nix.vim b/ftplugin/nix.vim
index c80b825a..40444150 100644
--- a/ftplugin/nix.vim
+++ b/ftplugin/nix.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 " Vim filetype plugin
 " Language:    Nix
 " Maintainer:  Daiderd Jordan <daiderd@gmail.com>
@@ -23,3 +20,4 @@ if get(g:, 'nix_recommended_style', 1)
     \ softtabstop=2
     \ expandtab 
 endif
+endif
diff --git a/ftplugin/oasis.vim b/ftplugin/oasis.vim
index 8471329f..51442403 100644
--- a/ftplugin/oasis.vim
+++ b/ftplugin/oasis.vim
@@ -1,7 +1,5 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 setlocal comments=:#
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/objc.vim b/ftplugin/objc.vim
index b3cfc708..5378f43b 100644
--- a/ftplugin/objc.vim
+++ b/ftplugin/objc.vim
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
 " Use C++ style comment strings with commentary.vim
 setl commentstring=//%s
 
 " Search for include files inside frameworks (used for gf etc.)
 setl includeexpr=substitute(v:fname,'\\([^/]\\+\\)/\\(.\\+\\)','/System/Library/Frameworks/\\1.framework/Headers/\\2','')
 
+endif
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index 77f8fef0..9c8f7908 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Language:    OCaml
 " Maintainer:  David Baelde        <firstname.name@ens-lyon.org>
 "              Mike Leary          <leary@nwlink.com>
@@ -642,3 +639,4 @@ let &cpoptions=s:cposet
 unlet s:cposet
 
 " vim:sw=2 fdm=indent
+endif
diff --git a/ftplugin/ocamlbuild_tags.vim b/ftplugin/ocamlbuild_tags.vim
index 8471329f..51442403 100644
--- a/ftplugin/ocamlbuild_tags.vim
+++ b/ftplugin/ocamlbuild_tags.vim
@@ -1,7 +1,5 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 setlocal comments=:#
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/omake.vim b/ftplugin/omake.vim
index ec3b428c..c38328a0 100644
--- a/ftplugin/omake.vim
+++ b/ftplugin/omake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim filetype plugin file
 " Language:	OMake
 
@@ -26,3 +23,4 @@ setlocal expandtab
 
 " Including files.
 let &l:include = '^\s*include'
+endif
diff --git a/ftplugin/opencl.vim b/ftplugin/opencl.vim
index 86d640ff..d3daecac 100644
--- a/ftplugin/opencl.vim
+++ b/ftplugin/opencl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'opencl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
 if exists("b:did_ftplugin") | finish | endif
 
 if version > 600
@@ -17,3 +14,4 @@ setlocal smarttab
 setlocal smartindent
 
 let b:did_ftplugin = 1
+endif
diff --git a/ftplugin/perl.vim b/ftplugin/perl.vim
index 0546d96a..cb1172e7 100644
--- a/ftplugin/perl.vim
+++ b/ftplugin/perl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Vim filetype plugin file
 " Language:      Perl
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -91,3 +88,4 @@ let b:match_words = '\<if\>:\<elsif\>:\<else\>'
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
+endif
diff --git a/ftplugin/plantuml.vim b/ftplugin/plantuml.vim
index 46d26dac..ab6d331b 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'plantuml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 scriptencoding utf-8
 " Vim filetype plugin file
 " Language:     PlantUML
@@ -46,3 +43,4 @@ let b:endwise_syngroups = 'plantumlKeyword'
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/ftplugin/pony.vim b/ftplugin/pony.vim
index c168cb97..7168d6be 100644
--- a/ftplugin/pony.vim
+++ b/ftplugin/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 filetype plugin file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -42,3 +39,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:did_ftplugin = 1
+endif
diff --git a/ftplugin/ps1.vim b/ftplugin/ps1.vim
index 0357f9df..c7a19fc4 100644
--- a/ftplugin/ps1.vim
+++ b/ftplugin/ps1.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 " Vim filetype plugin file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -36,3 +33,4 @@ endif
 let b:undo_ftplugin = "setlocal tw< cms< fo<" .
 			\ " | unlet! b:browsefilter"
 
+endif
diff --git a/ftplugin/ps1xml.vim b/ftplugin/ps1xml.vim
index 0365f588..4b1b3485 100644
--- a/ftplugin/ps1xml.vim
+++ b/ftplugin/ps1xml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 " Vim filetype plugin file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -33,3 +30,4 @@ endif
 let b:undo_ftplugin = "setlocal tw< cms< fo<" .
       \ " | unlet! b:browsefilter"
 
+endif
diff --git a/ftplugin/pug.vim b/ftplugin/pug.vim
index 1aa33607..32b8f76e 100644
--- a/ftplugin/pug.vim
+++ b/ftplugin/pug.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pug') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 " Vim filetype plugin
 " Language: Pug
 " Maintainer: Joshua Borton
@@ -59,3 +56,4 @@ let b:undo_ftplugin = "setl cms< com< "
 let &cpo = s:save_cpo
 
 " vim:set sw=2:
+endif
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index 0796f743..876b4748 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.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
 setl ts=2
 setl sts=2
 setl sw=2
@@ -9,3 +6,4 @@ setl et
 setl keywordprg=puppet\ describe\ --providers
 setl iskeyword=-,:,@,48-57,_,192-255
 setl cms=#\ %s
+endif
diff --git a/ftplugin/puppet_tagbar.vim b/ftplugin/puppet_tagbar.vim
index b607ccb0..9fdf69c7 100644
--- a/ftplugin/puppet_tagbar.vim
+++ b/ftplugin/puppet_tagbar.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
 " Puppet set up for Tagbar plugin
 " (https://github.com/majutsushi/tagbar).
 
@@ -46,3 +43,4 @@ endif
 
 let g:tagbar_type_puppet.deffile = puppet#ctags#OptionFile()
 
+endif
diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim
index 2030b86a..b637d347 100644
--- a/ftplugin/purescript.vim
+++ b/ftplugin/purescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'purescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--\ \|,:--
 setlocal include=^import
 setlocal includeexpr=printf('%s.purs',substitute(v:fname,'\\.','/','g'))
@@ -40,3 +37,4 @@ fun! InitPureScript()
   call add(s:PS, [dir, &l:path])
 endfun
 call InitPureScript()
+endif
diff --git a/ftplugin/qml.vim b/ftplugin/qml.vim
index e4320790..b4043b32 100644
--- a/ftplugin/qml.vim
+++ b/ftplugin/qml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'qml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 " Vim filetype plugin file
 " Language: qml
 " Last change: 2014 Feb 8
@@ -39,3 +36,4 @@ setlocal formatoptions+=croql
 
 let &cpoptions = s:cpoptions_save
 unlet s:cpoptions_save
+endif
diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index 84d6ddaa..3f76c298 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
 " URL:          http://github.com/wlangstroth/vim-racket
@@ -61,3 +58,4 @@ nnoremap <buffer> <f9> :!racket -t %<cr>
 
 "setl commentstring=;;%s
 setl commentstring=#\|\ %s\ \|#
+endif
diff --git a/ftplugin/raml.vim b/ftplugin/raml.vim
index 4cf8f5c2..21af8307 100644
--- a/ftplugin/raml.vim
+++ b/ftplugin/raml.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'raml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
 set ts=2 sts=2 sw=2 et
+endif
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index 064bd88e..5fc87d21 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.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
 " reStructuredText filetype plugin file
 " Language: reStructuredText documentation format
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
@@ -49,3 +46,4 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index 4edbbad6..81d9ad99 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.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 filetype plugin
 " Language:		Ruby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -436,3 +433,4 @@ endfunction
 "
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index 7f29cf38..3f8d9170 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/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
 " Language:     Rust
 " Description:  Vim ftplugin for Rust
 " Maintainer:   Chris Morgan <me@chrismorgan.info>
@@ -203,3 +200,4 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/ftplugin/rust/tagbar.vim b/ftplugin/rust/tagbar.vim
index 3de5d8a9..af01a818 100644
--- a/ftplugin/rust/tagbar.vim
+++ b/ftplugin/rust/tagbar.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
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
 "
@@ -42,3 +39,4 @@ unlet s:save_cpo
 
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index d843daa9..199aed94 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 " Vim filetype plugin
 " Language:             Scala
 " Maintainer:           Derek Wyatt
@@ -178,3 +175,4 @@ noremap <script> <buffer> <silent> ]] :call <SID>NextSection(0)<cr>
 noremap <script> <buffer> <silent> [[ :call <SID>NextSection(1)<cr>
 
 " vim:set sw=2 sts=2 ts=8 et:
+endif
diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim
index 86995e0d..2660d4c6 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 XPTemplate priority=lang
 
@@ -31,3 +28,4 @@ trait `derived^`trait^Component extends `trait^Component {
 		`body2^
 	}
 }
+endif
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index e53b5591..5728e98a 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
 "
@@ -33,3 +30,4 @@ let g:tagbar_type_scala = {
 if get(g:, 'scala_use_builtin_tagbar_defs', 1)
   let g:tagbar_type_scala.deffile = expand('<sfile>:p:h:h:h') . '/ctags/scala.ctags'
 endif
+endif
diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim
index c723d957..ebc6889a 100644
--- a/ftplugin/scss.vim
+++ b/ftplugin/scss.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 if exists('b:did_indent') && b:did_indent
   " be kind. allow users to override this. Does it work?
   finish
@@ -15,3 +12,4 @@ setlocal formatoptions+=ro
 
 " SCSS comments are either /* */ or //
 setlocal comments=s1:/*,mb:*,ex:*/,://
+endif
diff --git a/ftplugin/sexplib.vim b/ftplugin/sexplib.vim
index 373eef3a..23b689db 100644
--- a/ftplugin/sexplib.vim
+++ b/ftplugin/sexplib.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Language:    Sexplib
 " Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
 " URL:         http://www.ocaml.info/vim/ftplugin/sexplib.vim
@@ -16,3 +13,4 @@ let b:did_ftplugin=1
 " Comment string
 setl commentstring=;\ %s
 setl comments=:;
+endif
diff --git a/ftplugin/slim.vim b/ftplugin/slim.vim
index 83a768bf..ff430c50 100644
--- a/ftplugin/slim.vim
+++ b/ftplugin/slim.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slim') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 if exists("b:did_ftplugin")
   finish
 endif
@@ -27,3 +24,4 @@ let b:undo_ftplugin = "setl isk<" . " | " . s:undo_ftplugin
 
 setlocal iskeyword+=-
 setlocal commentstring=/%s
+endif
diff --git a/ftplugin/smt2.vim b/ftplugin/smt2.vim
index f84af275..9d4a81c0 100644
--- a/ftplugin/smt2.vim
+++ b/ftplugin/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
 setlocal iskeyword+=-,:,#,',$
 
 " If no command for invoking a solver is specified in ~/.vimrc, test if either
@@ -27,3 +24,4 @@ nnoremap <silent> <buffer> <localleader>v :call smt2#PrintSolverVersion()<cr>
 
 " Comment String
 setlocal commentstring=;%s
+endif
diff --git a/ftplugin/solidity.vim b/ftplugin/solidity.vim
index 1971f587..8bbbcd2c 100644
--- a/ftplugin/solidity.vim
+++ b/ftplugin/solidity.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'solidity') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 setlocal commentstring=//\ %s
+endif
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index 7cd92a64..0cc4d194 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'stylus') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 " Vim filetype plugin
 " Language: Stylus
 " Maintainer: Marc Harter
@@ -65,3 +62,4 @@ let &cpo = s:save_cpo
 command! Stylus !clear; cat % | stylus
 
 " vim:set sw=2:
+endif
diff --git a/ftplugin/swift.vim b/ftplugin/swift.vim
index 0d3eaafd..6e731d39 100644
--- a/ftplugin/swift.vim
+++ b/ftplugin/swift.vim
@@ -1,8 +1,6 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'swift') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 setlocal commentstring=//\ %s
 " @-@ adds the literal @ to iskeyword for @IBAction and similar
 setlocal iskeyword+=@-@,#
 setlocal completefunc=syntaxcomplete#Complete
+endif
diff --git a/ftplugin/tablegen.vim b/ftplugin/tablegen.vim
index 94909ef5..b5c9f471 100644
--- a/ftplugin/tablegen.vim
+++ b/ftplugin/tablegen.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'llvm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 " Vim filetype plugin file
 " Language: LLVM TableGen
 " Maintainer: The LLVM team, http://llvm.org/
@@ -14,3 +11,4 @@ let b:did_ftplugin = 1
 setlocal matchpairs+=<:>
 setlocal softtabstop=2 shiftwidth=2
 setlocal expandtab
+endif
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 9b4cc2bd..83591f04 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/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
 " terraform.vim - basic vim/terraform integration
 " Maintainer: HashiVim <https://github.com/hashivim>
 
@@ -63,3 +60,4 @@ endif
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/ftplugin/tex_LatexBox.vim b/ftplugin/tex_LatexBox.vim
index ec85ba1d..14df8f94 100644
--- a/ftplugin/tex_LatexBox.vim
+++ b/ftplugin/tex_LatexBox.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box plugin for Vim
 " Maintainer: David Munger
 " Email: mungerd@gmail.com
@@ -35,3 +32,4 @@ if !exists('b:LatexBox_loaded')
 endif
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/textile.vim b/ftplugin/textile.vim
index 4741f852..681c04db 100644
--- a/ftplugin/textile.vim
+++ b/ftplugin/textile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'textile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
 " textile.vim
 "
 " Tim Harper (tim.theenchanter.com)
@@ -61,3 +58,4 @@ function! TextileRenderBufferToTab()
   set syntax=html
 endfunction
 
+endif
diff --git a/ftplugin/tmux.vim b/ftplugin/tmux.vim
index 86f87f63..b25ab68f 100644
--- a/ftplugin/tmux.vim
+++ b/ftplugin/tmux.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'tmux') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
 " Vim filetype plugin file
 " Language: tmux(1) configuration file
 " URL: https://github.com/ericpruitt/tmux.vim/
@@ -14,3 +11,4 @@ endif
 let b:did_ftplugin = 1
 
 setlocal commentstring=#\ %s
+endif
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
index e0b4adc1..77a02d05 100644
--- a/ftplugin/toml.vim
+++ b/ftplugin/toml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'toml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1
 " File: ftplugin/toml.vim
 " Author: Kevin Ballard <kevin@sb.org>
 " Description: FileType Plugin for Toml
@@ -23,3 +20,4 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: set et sw=4 ts=4:
+endif
diff --git a/ftplugin/tsx.vim b/ftplugin/tsx.vim
index b6c76481..b6a6e6a9 100644
--- a/ftplugin/tsx.vim
+++ b/ftplugin/tsx.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " modified from mxw/vim-jsx from html.vim
 if exists("loaded_matchit") && !exists('b:tsx_match_words')
   let b:match_ignorecase = 0
@@ -13,3 +10,4 @@ if exists("loaded_matchit") && !exists('b:tsx_match_words')
 endif
 
 set suffixesadd+=.tsx
+endif
diff --git a/ftplugin/tt2html.vim b/ftplugin/tt2html.vim
index 62461824..bd79624b 100644
--- a/ftplugin/tt2html.vim
+++ b/ftplugin/tt2html.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Language:      TT2 embedded with HTML
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
@@ -15,3 +12,4 @@ endif
 
 " Just use the HTML plugin for now.
 runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
+endif
diff --git a/ftplugin/twig.vim b/ftplugin/twig.vim
index 086e938f..20f31ec2 100644
--- a/ftplugin/twig.vim
+++ b/ftplugin/twig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'twig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 " Vim filetype plugin
 " Language: Twig
 " Maintainer: F. Gabriel Gosselin <gabrielNOSPAM@evidens.ca>
@@ -42,3 +39,4 @@ else
 endif
 
 " vim:set sw=2:
+endif
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index b3d4c9c4..065ebe18 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " set Vi-incompatible, compiler and commentstring
 
 if exists("b:did_ftplugin")
@@ -84,3 +81,4 @@ let g:tagbar_type_typescript = {
 if get(g:, 'typescript_use_builtin_tagbar_defs', 1)
   let g:tagbar_type_typescript.deffile = expand('<sfile>:p:h:h') . '/ctags/typescript.ctags'
 endif
+endif
diff --git a/ftplugin/vifm-cmdedit.vim b/ftplugin/vifm-cmdedit.vim
index 14f70187..2b3c926b 100644
--- a/ftplugin/vifm-cmdedit.vim
+++ b/ftplugin/vifm-cmdedit.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
 " vifm command-line editing buffer filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: August 18, 2013
@@ -21,3 +18,4 @@ set syntax=vifm
 call vifm#edit#Init()
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
+endif
diff --git a/ftplugin/vifm-edit.vim b/ftplugin/vifm-edit.vim
index f2021ed3..450cfc0d 100644
--- a/ftplugin/vifm-edit.vim
+++ b/ftplugin/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
 " vifm command-line editing buffer filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: August 18, 2013
@@ -15,3 +12,4 @@ let b:did_ftplugin = 1
 call vifm#edit#Init()
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
+endif
diff --git a/ftplugin/vifm-rename.vim b/ftplugin/vifm-rename.vim
index b7d0ed26..e806e212 100644
--- a/ftplugin/vifm-rename.vim
+++ b/ftplugin/vifm-rename.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
 " Filetype plugin for vifm rename buffer
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: October 05, 2014
@@ -60,3 +57,4 @@ setlocal cursorbind
 setlocal scrollbind
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
+endif
diff --git a/ftplugin/vifm.vim b/ftplugin/vifm.vim
index 03e06e07..251d19fa 100644
--- a/ftplugin/vifm.vim
+++ b/ftplugin/vifm.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
 " vifmrc filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: July 08, 2016
@@ -48,3 +45,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
+endif
diff --git a/ftplugin/vue.vim b/ftplugin/vue.vim
index 8aded135..f7727131 100644
--- a/ftplugin/vue.vim
+++ b/ftplugin/vue.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vue') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 " Vim filetype plugin
 " Language: Vue.js
 " Maintainer: Eduardo San Martin Morote
@@ -21,3 +18,4 @@ if !exists('g:no_plugin_maps') && !exists('g:no_vue_maps')
   nnoremap <silent> <buffer> [] :call search('^</\(template\<Bar>script\<Bar>style\)', 'bW')<CR>
   nnoremap <silent> <buffer> ][ :call search('^</\(template\<Bar>script\<Bar>style\)', 'W')<CR>
 endif
+endif
diff --git a/ftplugin/xs.vim b/ftplugin/xs.vim
index 1b44ab93..a13cb85d 100644
--- a/ftplugin/xs.vim
+++ b/ftplugin/xs.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Vim filetype plugin file
 " Language:      XS (Perl extension interface language)
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -16,3 +13,4 @@ endif
 
 " Just use the C plugin for now.
 runtime! ftplugin/c.vim ftplugin/c_*.vim ftplugin/c/*.vim
+endif
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index 38008957..e7b0712d 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.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
 " Only do this when not done yet for this buffer
 if (exists("b:did_ftplugin"))
   finish
@@ -16,3 +13,4 @@ set shiftwidth=4
 setlocal suffixesadd=.zig
 setlocal commentstring=//\ %s
 setlocal makeprg=zig\ build
+endif
-- 
cgit v1.2.3