From 1597b7b766ee3999cdfea862af14999c37041d0e Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 4 Mar 2019 09:28:35 +0100
Subject: Change plugin guard for disabling, fixes #371

---
 ftplugin/Dockerfile.vim         | 8 ++++----
 ftplugin/ansible.vim            | 8 ++++----
 ftplugin/ansible_hosts.vim      | 8 ++++----
 ftplugin/blade.vim              | 8 ++++----
 ftplugin/caddyfile.vim          | 8 ++++----
 ftplugin/clojure.vim            | 8 ++++----
 ftplugin/coffee.vim             | 8 ++++----
 ftplugin/cryptol/folding.vim    | 8 ++++----
 ftplugin/crystal.vim            | 8 ++++----
 ftplugin/cucumber.vim           | 8 ++++----
 ftplugin/dart.vim               | 8 ++++----
 ftplugin/eelixir.vim            | 8 ++++----
 ftplugin/elixir.vim             | 8 ++++----
 ftplugin/elm.vim                | 8 ++++----
 ftplugin/elm/tagbar.vim         | 8 ++++----
 ftplugin/ember-script.vim       | 8 ++++----
 ftplugin/emblem.vim             | 8 ++++----
 ftplugin/eruby.vim              | 8 ++++----
 ftplugin/fish.vim               | 8 ++++----
 ftplugin/git.vim                | 8 ++++----
 ftplugin/gitcommit.vim          | 8 ++++----
 ftplugin/gitconfig.vim          | 8 ++++----
 ftplugin/gitrebase.vim          | 8 ++++----
 ftplugin/gitsendemail.vim       | 8 ++++----
 ftplugin/graphql.vim            | 8 ++++----
 ftplugin/haml.vim               | 8 ++++----
 ftplugin/html.vim               | 8 ++++----
 ftplugin/i3config.vim           | 8 ++++----
 ftplugin/json.vim               | 8 ++++----
 ftplugin/julia.vim              | 8 ++++----
 ftplugin/juliadoc.vim           | 8 ++++----
 ftplugin/kotlin.vim             | 8 ++++----
 ftplugin/latex-box/common.vim   | 8 ++++----
 ftplugin/latex-box/complete.vim | 8 ++++----
 ftplugin/latex-box/findmain.vim | 8 ++++----
 ftplugin/latex-box/folding.vim  | 8 ++++----
 ftplugin/latex-box/latexmk.vim  | 8 ++++----
 ftplugin/latex-box/mappings.vim | 8 ++++----
 ftplugin/latex-box/motion.vim   | 8 ++++----
 ftplugin/latextoc.vim           | 8 ++++----
 ftplugin/less.vim               | 8 ++++----
 ftplugin/liquid.vim             | 8 ++++----
 ftplugin/litcoffee.vim          | 8 ++++----
 ftplugin/ls.vim                 | 8 ++++----
 ftplugin/mail_vifm.vim          | 8 ++++----
 ftplugin/mako.vim               | 8 ++++----
 ftplugin/mma.vim                | 8 ++++----
 ftplugin/moon.vim               | 8 ++++----
 ftplugin/mustache.vim           | 8 ++++----
 ftplugin/nginx.vim              | 8 ++++----
 ftplugin/nix.vim                | 8 ++++----
 ftplugin/objc.vim               | 8 ++++----
 ftplugin/ocaml.vim              | 8 ++++----
 ftplugin/opencl.vim             | 8 ++++----
 ftplugin/org.vim                | 8 ++++----
 ftplugin/perl.vim               | 8 ++++----
 ftplugin/plantuml.vim           | 8 ++++----
 ftplugin/pony.vim               | 8 ++++----
 ftplugin/ps1.vim                | 8 ++++----
 ftplugin/ps1xml.vim             | 8 ++++----
 ftplugin/pug.vim                | 8 ++++----
 ftplugin/puppet.vim             | 8 ++++----
 ftplugin/purescript.vim         | 8 ++++----
 ftplugin/qml.vim                | 8 ++++----
 ftplugin/r.vim                  | 8 ++++----
 ftplugin/racket.vim             | 8 ++++----
 ftplugin/raml.vim               | 8 ++++----
 ftplugin/rhelp.vim              | 8 ++++----
 ftplugin/rnoweb.vim             | 8 ++++----
 ftplugin/rst.vim                | 8 ++++----
 ftplugin/ruby.vim               | 8 ++++----
 ftplugin/rust.vim               | 8 ++++----
 ftplugin/rust/tagbar.vim        | 8 ++++----
 ftplugin/scala.vim              | 8 ++++----
 ftplugin/scala.xpt.vim          | 8 ++++----
 ftplugin/scala/tagbar.vim       | 8 ++++----
 ftplugin/scss.vim               | 8 ++++----
 ftplugin/slim.vim               | 8 ++++----
 ftplugin/solidity.vim           | 8 ++++----
 ftplugin/stylus.vim             | 8 ++++----
 ftplugin/swift.vim              | 8 ++++----
 ftplugin/terraform.vim          | 8 ++++----
 ftplugin/tex_LatexBox.vim       | 8 ++++----
 ftplugin/textile.vim            | 8 ++++----
 ftplugin/tmux.vim               | 8 ++++----
 ftplugin/toml.vim               | 8 ++++----
 ftplugin/tt2html.vim            | 8 ++++----
 ftplugin/twig.vim               | 8 ++++----
 ftplugin/typescript.vim         | 8 ++++----
 ftplugin/vifm-cmdedit.vim       | 8 ++++----
 ftplugin/vifm-edit.vim          | 8 ++++----
 ftplugin/vifm-rename.vim        | 8 ++++----
 ftplugin/vifm.vim               | 8 ++++----
 ftplugin/vue.vim                | 8 ++++----
 ftplugin/xs.vim                 | 8 ++++----
 95 files changed, 380 insertions(+), 380 deletions(-)

(limited to 'ftplugin')

diff --git a/ftplugin/Dockerfile.vim b/ftplugin/Dockerfile.vim
index a9bba59a..909739aa 100644
--- a/ftplugin/Dockerfile.vim
+++ b/ftplugin/Dockerfile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
+  finish
+endif
+
 function! DockerfileReplaceInstruction(original, replacement)
     let syn = synIDtrans(synID(line("."), col(".") - 1, 0))
     if syn != hlID("Comment") && syn != hlID("Constant") && strlen(getline(".")) == 0
@@ -27,5 +29,3 @@ 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 5f2f3f74..491cd803 100644
--- a/ftplugin/ansible.vim
+++ b/ftplugin/ansible.vim
@@ -1,10 +1,10 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
+  finish
+endif
+
 " 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 7dbd8ec4..8b3fbe93 100644
--- a/ftplugin/ansible_hosts.vim
+++ b/ftplugin/ansible_hosts.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
+  finish
+endif
+
 if exists("b:did_ftplugin")
   finish
 else
@@ -9,5 +11,3 @@ 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 34879610..cbc8513a 100644
--- a/ftplugin/blade.vim
+++ b/ftplugin/blade.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'blade') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
@@ -33,5 +35,3 @@ 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 e26f73f0..1339ca94 100644
--- a/ftplugin/caddyfile.vim
+++ b/ftplugin/caddyfile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'caddyfile') != -1
+  finish
+endif
+
 " Language:	    Caddyfile
 " Author:	    Josh Glendenning <josh@isobit.io>
 
@@ -24,5 +26,3 @@ else
 	let g:NERDCustomDelimiters = {'caddyfile': s:delimiters}
 endif
 unlet s:delimiters
-
-endif
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 4568d46e..0ed94392 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:     Clojure
 " Author:       Meikel Brandmeyer <mb@kotka.de>
@@ -95,5 +97,3 @@ 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 809c355f..7084424e 100644
--- a/ftplugin/coffee.vim
+++ b/ftplugin/coffee.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -405,5 +407,3 @@ 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 2b8ee5a3..a74c8bc4 100644
--- a/ftplugin/cryptol/folding.vim
+++ b/ftplugin/cryptol/folding.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cryptol') != -1
+  finish
+endif
+
 " Copyright © 2013 Edward O'Callaghan. All Rights Reserved.
 
 "setlocal foldmethod=indent
@@ -46,5 +48,3 @@ function! GetPotionFold(lnum)
         return '>' . next_indent
     endif
 endfunction
-
-endif
diff --git a/ftplugin/crystal.vim b/ftplugin/crystal.vim
index 58ce5251..8ebdaed8 100644
--- a/ftplugin/crystal.vim
+++ b/ftplugin/crystal.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 if exists('b:did_ftplugin')
   finish
 endif
@@ -80,5 +82,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/ftplugin/cucumber.vim b/ftplugin/cucumber.vim
index 2b9fff04..a07db5da 100644
--- a/ftplugin/cucumber.vim
+++ b/ftplugin/cucumber.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -150,5 +152,3 @@ 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 b3b7291d..71114b0a 100644
--- a/ftplugin/dart.vim
+++ b/ftplugin/dart.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
+  finish
+endif
+
 if exists('b:did_ftplugin')
   finish
 endif
@@ -29,5 +31,3 @@ 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/eelixir.vim b/ftplugin/eelixir.vim
index a4721f99..2e3656c0 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if exists("b:did_ftplugin")
   finish
 endif
@@ -104,5 +106,3 @@ 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 f37efe68..a49d639c 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if exists('b:did_ftplugin')
   finish
 endif
@@ -51,5 +53,3 @@ 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 b2423c29..04b829d2 100644
--- a/ftplugin/elm.vim
+++ b/ftplugin/elm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
+
 " plugin for Elm (http://elm-lang.org/)
 
 if exists('b:did_ftplugin')
@@ -109,5 +111,3 @@ 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 1ad3a48b..4e1ce756 100644
--- a/ftplugin/elm/tagbar.vim
+++ b/ftplugin/elm/tagbar.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
+
 if !executable('ctags')
     finish
 elseif globpath(&runtimepath, 'plugin/tagbar.vim') ==? ''
@@ -20,5 +22,3 @@ function! s:SetTagbar()
 endfunction
 
 call s:SetTagbar()
-
-endif
diff --git a/ftplugin/ember-script.vim b/ftplugin/ember-script.vim
index d7f21e88..49387198 100644
--- a/ftplugin/ember-script.vim
+++ b/ftplugin/ember-script.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emberscript') != -1
+  finish
+endif
+
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
 " URL:         http://github.com/yalesov/vim-ember-script
@@ -21,5 +23,3 @@ else
 endif
 setlocal comments=:#
 setlocal commentstring=#\ %s
-
-endif
diff --git a/ftplugin/emblem.vim b/ftplugin/emblem.vim
index 25f88adf..e3a80a42 100644
--- a/ftplugin/emblem.vim
+++ b/ftplugin/emblem.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emblem') != -1
+  finish
+endif
+
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
 " URL:         http://github.com/yalesov/vim-emblem
@@ -17,5 +19,3 @@ setlocal smartindent
 setlocal formatoptions=q
 setlocal comments=:/
 setlocal commentstring=/\ %s
-
-endif
diff --git a/ftplugin/eruby.vim b/ftplugin/eruby.vim
index 07558f9c..483f40c9 100644
--- a/ftplugin/eruby.vim
+++ b/ftplugin/eruby.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -131,5 +133,3 @@ function! ErubyAtCursor() abort
 endfunction
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index c6c1f6d8..3784b4c4 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/fish.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
+  finish
+endif
+
 setlocal comments=:#
 setlocal commentstring=#%s
 setlocal define=\\v^\\s*function>
@@ -39,5 +41,3 @@ 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 e5c34b48..7aca0e5b 100644
--- a/ftplugin/git.vim
+++ b/ftplugin/git.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	generic git output
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -41,5 +43,3 @@ 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 dc6a581a..177beef2 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -64,5 +66,3 @@ 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 23282522..325b771e 100644
--- a/ftplugin/gitconfig.vim
+++ b/ftplugin/gitconfig.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -15,5 +17,3 @@ 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 032aba31..e28d83c0 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -45,5 +47,3 @@ 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 69e0360e..baf6080e 100644
--- a/ftplugin/gitsendemail.vim
+++ b/ftplugin/gitsendemail.vim
@@ -1,10 +1,10 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " 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 ce5fd3d1..7734acee 100644
--- a/ftplugin/graphql.vim
+++ b/ftplugin/graphql.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -18,5 +20,3 @@ 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 6339f556..ddcae644 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -71,5 +73,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index 782d4015..87fed79d 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
+
 " Maintainer:  	othree <othree@gmail.com>
 " URL:		      http://github.com/othree/html5.vim
 " Last Change:  2014-05-02
@@ -9,5 +11,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " setlocal iskeyword+=-
 
 setlocal commentstring=<!--%s-->
-
-endif
diff --git a/ftplugin/i3config.vim b/ftplugin/i3config.vim
index 6470f448..41de3247 100644
--- a/ftplugin/i3config.vim
+++ b/ftplugin/i3config.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
-  
-setlocal commentstring=#\ %s
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'i3') != -1
+  finish
 endif
+
+setlocal commentstring=#\ %s
diff --git a/ftplugin/json.vim b/ftplugin/json.vim
index 3f4adccd..132bea4b 100644
--- a/ftplugin/json.vim
+++ b/ftplugin/json.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	JSON
 " Maintainer:	Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
@@ -38,5 +40,3 @@ 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 bed55a8f..bdfe9877 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:	Julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
@@ -107,5 +109,3 @@ 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 0544ff8d..b56a45d2 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language: Julia document
 
@@ -30,5 +32,3 @@ 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 0fceaf35..417f0824 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -1,9 +1,9 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'kotlin') != -1
+  finish
+endif
+
 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 20488846..1eccacd4 100644
--- a/ftplugin/latex-box/common.vim
+++ b/ftplugin/latex-box/common.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box common functions
 
 " Error Format {{{
@@ -413,5 +415,3 @@ 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 aecb0d8d..365ea14f 100644
--- a/ftplugin/latex-box/complete.vim
+++ b/ftplugin/latex-box/complete.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box completion
 
 setlocal omnifunc=LatexBox_Complete
@@ -932,5 +934,3 @@ 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 3b81b0d7..a52d745e 100644
--- a/ftplugin/latex-box/findmain.vim
+++ b/ftplugin/latex-box/findmain.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " 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
@@ -62,5 +64,3 @@ function! LatexBox_GetMainFileName(...)
 	"       certain platforms.
 	return lheadfile
 endfunction
-
-endif
diff --git a/ftplugin/latex-box/folding.vim b/ftplugin/latex-box/folding.vim
index d6f36272..6311ebf2 100644
--- a/ftplugin/latex-box/folding.vim
+++ b/ftplugin/latex-box/folding.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " Folding support for LaTeX
 
 "
@@ -378,5 +380,3 @@ 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 15db3686..bee760a5 100644
--- a/ftplugin/latex-box/latexmk.vim
+++ b/ftplugin/latex-box/latexmk.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box latexmk functions
 
 " Options and variables {{{
@@ -554,5 +556,3 @@ 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 7141635e..ccfb5d8d 100644
--- a/ftplugin/latex-box/mappings.vim
+++ b/ftplugin/latex-box/mappings.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box mappings
 
 if exists("g:LatexBox_no_mappings")
@@ -106,5 +108,3 @@ 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 2053149c..b9614d72 100644
--- a/ftplugin/latex-box/motion.vim
+++ b/ftplugin/latex-box/motion.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box motion functions
 
 " Motion options {{{
@@ -544,5 +546,3 @@ 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 bfb8658e..9553b211 100644
--- a/ftplugin/latextoc.vim
+++ b/ftplugin/latextoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " {{{1 Settings
 setlocal buftype=nofile
 setlocal bufhidden=wipe
@@ -202,5 +204,3 @@ 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 69b2b391..55a282dc 100644
--- a/ftplugin/less.vim
+++ b/ftplugin/less.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	    LessCSS
 " Author:	    Tim Pope <vimNOSPAM@tpope.org>
@@ -26,5 +28,3 @@ setlocal fo=croql
 let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/liquid.vim b/ftplugin/liquid.vim
index 34543367..cb65c184 100644
--- a/ftplugin/liquid.vim
+++ b/ftplugin/liquid.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'liquid') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:     Liquid
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
@@ -61,5 +63,3 @@ endif
 setlocal commentstring={%\ comment\ %}%s{%\ endcomment\ %}
 
 let b:undo_ftplugin .= 'setl cms< | unlet! b:browsefilter b:match_words'
-
-endif
diff --git a/ftplugin/litcoffee.vim b/ftplugin/litcoffee.vim
index ef4aee21..9bb4f697 100644
--- a/ftplugin/litcoffee.vim
+++ b/ftplugin/litcoffee.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
-runtime ftplugin/coffee.vim
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
 endif
+
+runtime ftplugin/coffee.vim
diff --git a/ftplugin/ls.vim b/ftplugin/ls.vim
index 6ce6b57a..a0b86468 100644
--- a/ftplugin/ls.vim
+++ b/ftplugin/ls.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
+  finish
+endif
+
 " Language:    LiveScript
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -204,5 +206,3 @@ 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 9348b19a..7da4b3fb 100644
--- a/ftplugin/mail_vifm.vim
+++ b/ftplugin/mail_vifm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " Mail file type extension to pick files for attachments via vifm
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: January 02, 2018
@@ -64,5 +66,3 @@ 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 cd8cd534..1caf0e0c 100644
--- a/ftplugin/mako.vim
+++ b/ftplugin/mako.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mako') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:     Mako
 " Maintainer:   Randy Stauner <randy@magnificent-tears.com>
@@ -11,5 +13,3 @@ let b:did_ftplugin = 1
 
 setlocal comments=:##
 setlocal commentstring=##%s
-
-endif
diff --git a/ftplugin/mma.vim b/ftplugin/mma.vim
index efbc8d55..c1f8a5a3 100644
--- a/ftplugin/mma.vim
+++ b/ftplugin/mma.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mathematica') != -1
+  finish
+endif
+
 "Vim filetype plugin
 " Language: Mathematica
 " Maintainer: R. Menon <rsmenon@icloud.com>
@@ -59,5 +61,3 @@ unlet s:cpo_save
 "}
 
 " vim: set foldmarker={,} foldlevel=0 foldmethod=marker:
-
-endif
diff --git a/ftplugin/moon.vim b/ftplugin/moon.vim
index 4dc259fe..e8adbf2f 100644
--- a/ftplugin/moon.vim
+++ b/ftplugin/moon.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'moonscript') != -1
+  finish
+endif
+
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
 " Based On:    CoffeeScript by Mick Koch <kchmck@gmail.com>
@@ -16,5 +18,3 @@ 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 a057c092..d8a351b7 100644
--- a/ftplugin/mustache.vim
+++ b/ftplugin/mustache.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'handlebars') != -1
+  finish
+endif
+
 if exists('b:loaded_mustache_handlebars')
   finish
 endif
@@ -120,5 +122,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nofoldenable
-
-endif
diff --git a/ftplugin/nginx.vim b/ftplugin/nginx.vim
index efcccbd0..6ba4d016 100644
--- a/ftplugin/nginx.vim
+++ b/ftplugin/nginx.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
-  
-setlocal commentstring=#\ %s
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nginx') != -1
+  finish
 endif
+
+setlocal commentstring=#\ %s
diff --git a/ftplugin/nix.vim b/ftplugin/nix.vim
index 52c0ee69..900ee683 100644
--- a/ftplugin/nix.vim
+++ b/ftplugin/nix.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:    Nix
 " Maintainer:  Daiderd Jordan <daiderd@gmail.com>
@@ -18,5 +20,3 @@ setlocal
     \ softtabstop=2
     \ expandtab
     \ iskeyword+=-
-
-endif
diff --git a/ftplugin/objc.vim b/ftplugin/objc.vim
index 409fb1a2..b3cfc708 100644
--- a/ftplugin/objc.vim
+++ b/ftplugin/objc.vim
@@ -1,10 +1,10 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
+  finish
+endif
+
 " 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 87cd9ef4..5766d3e6 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
+  finish
+endif
+
 " Language:    OCaml
 " Maintainer:  David Baelde        <firstname.name@ens-lyon.org>
 "              Mike Leary          <leary@nwlink.com>
@@ -505,5 +507,3 @@ let &cpoptions=s:cposet
 unlet s:cposet
 
 " vim:sw=2
-
-endif
diff --git a/ftplugin/opencl.vim b/ftplugin/opencl.vim
index 816bc28c..86d640ff 100644
--- a/ftplugin/opencl.vim
+++ b/ftplugin/opencl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'opencl') != -1
+  finish
+endif
+
 if exists("b:did_ftplugin") | finish | endif
 
 if version > 600
@@ -15,5 +17,3 @@ setlocal smarttab
 setlocal smartindent
 
 let b:did_ftplugin = 1
-
-endif
diff --git a/ftplugin/org.vim b/ftplugin/org.vim
index 6c7bd874..fc1d722d 100644
--- a/ftplugin/org.vim
+++ b/ftplugin/org.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'org') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'org') != -1
+  finish
+endif
+
 " org.vim -- Text outlining and task management for Vim based on Emacs' Org-Mode
 " @Author       : Jan Christoph Ebersbach (jceb@e-jc.de)
 " @License      : AGPL3 (see http://www.gnu.org/licenses/agpl.txt)
@@ -169,5 +171,3 @@ fun CalendarAction(day, month, year, week, dir)
 	" restore calendar_action
 	let g:calendar_action = g:org_calendar_action_backup
 endf
-
-endif
diff --git a/ftplugin/perl.vim b/ftplugin/perl.vim
index e21f7df8..0546d96a 100644
--- a/ftplugin/perl.vim
+++ b/ftplugin/perl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:      Perl
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -89,5 +91,3 @@ 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 4d55d809..9fe82d5e 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'plantuml') != -1
+  finish
+endif
+
 if exists('b:loaded_plantuml_plugin')
   finish
 endif
@@ -33,5 +35,3 @@ let b:endwise_syngroups = 'plantumlKeyword'
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/pony.vim b/ftplugin/pony.vim
index eef6824e..c168cb97 100644
--- a/ftplugin/pony.vim
+++ b/ftplugin/pony.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -40,5 +42,3 @@ 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 a88fe019..0357f9df 100644
--- a/ftplugin/ps1.vim
+++ b/ftplugin/ps1.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -34,5 +36,3 @@ endif
 let b:undo_ftplugin = "setlocal tw< cms< fo<" .
 			\ " | unlet! b:browsefilter"
 
-
-endif
diff --git a/ftplugin/ps1xml.vim b/ftplugin/ps1xml.vim
index 11815d2d..0365f588 100644
--- a/ftplugin/ps1xml.vim
+++ b/ftplugin/ps1xml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -31,5 +33,3 @@ endif
 let b:undo_ftplugin = "setlocal tw< cms< fo<" .
       \ " | unlet! b:browsefilter"
 
-
-endif
diff --git a/ftplugin/pug.vim b/ftplugin/pug.vim
index dea25f68..1aa33607 100644
--- a/ftplugin/pug.vim
+++ b/ftplugin/pug.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pug') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language: Pug
 " Maintainer: Joshua Borton
@@ -57,5 +59,3 @@ 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 d52f6b2d..0796f743 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
+  finish
+endif
+
 setl ts=2
 setl sts=2
 setl sw=2
@@ -7,5 +9,3 @@ setl et
 setl keywordprg=puppet\ describe\ --providers
 setl iskeyword=-,:,@,48-57,_,192-255
 setl cms=#\ %s
-
-endif
diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim
index 37951f44..2030b86a 100644
--- a/ftplugin/purescript.vim
+++ b/ftplugin/purescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'purescript') != -1
+  finish
+endif
+
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--\ \|,:--
 setlocal include=^import
 setlocal includeexpr=printf('%s.purs',substitute(v:fname,'\\.','/','g'))
@@ -38,5 +40,3 @@ fun! InitPureScript()
   call add(s:PS, [dir, &l:path])
 endfun
 call InitPureScript()
-
-endif
diff --git a/ftplugin/qml.vim b/ftplugin/qml.vim
index 1e0373d2..e4320790 100644
--- a/ftplugin/qml.vim
+++ b/ftplugin/qml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'qml') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language: qml
 " Last change: 2014 Feb 8
@@ -37,5 +39,3 @@ setlocal formatoptions+=croql
 
 let &cpoptions = s:cpoptions_save
 unlet s:cpoptions_save
-
-endif
diff --git a/ftplugin/r.vim b/ftplugin/r.vim
index 599d3ce7..707e6369 100644
--- a/ftplugin/r.vim
+++ b/ftplugin/r.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'r-lang') != -1
+  finish
+endif
+
 " ftplugin for R files
 "
 " Author: Iago Mosqueira <i.mosqueira@ic.ac.uk>
@@ -69,5 +71,3 @@ inoremap <M-Enter> <Esc>:execute line(".") 'w >> ~/.r-pipe'<CR>o
 
 " Send current file to R
 noremap <buffer> <F5> :execute '1 ,' line("$") 'w >> ~/.r-pipe' <CR><CR>
-
-endif
diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index 14ebdb7c..84d6ddaa 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
+  finish
+endif
+
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
 " URL:          http://github.com/wlangstroth/vim-racket
@@ -59,5 +61,3 @@ nnoremap <buffer> <f9> :!racket -t %<cr>
 
 "setl commentstring=;;%s
 setl commentstring=#\|\ %s\ \|#
-
-endif
diff --git a/ftplugin/raml.vim b/ftplugin/raml.vim
index 142e70bd..4cf8f5c2 100644
--- a/ftplugin/raml.vim
+++ b/ftplugin/raml.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
-  
-set ts=2 sts=2 sw=2 et
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'raml') != -1
+  finish
 endif
+
+set ts=2 sts=2 sw=2 et
diff --git a/ftplugin/rhelp.vim b/ftplugin/rhelp.vim
index c73472d4..aa206eba 100644
--- a/ftplugin/rhelp.vim
+++ b/ftplugin/rhelp.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'r-lang') != -1
+  finish
+endif
+
 " ftplugin for R help files
 "
 " Author: Johannes Ranke <jranke@uni-bremen.de>
@@ -48,5 +50,3 @@ vnoremap <buffer> r :w >> ~/.r-pipe<CR>
 
 " Write and process mode (somehow mapping <C-Enter> does not work)
 inoremap <M-Enter> <Esc>:execute line(".") 'w >> ~/.r-pipe'<CR>o
-
-endif
diff --git a/ftplugin/rnoweb.vim b/ftplugin/rnoweb.vim
index 5ea2cdd6..60566be1 100644
--- a/ftplugin/rnoweb.vim
+++ b/ftplugin/rnoweb.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'r-lang') != -1
+  finish
+endif
+
 " ftplugin for Sweave files containing both LaTeX and R code
 "
 " Maintainer: Johannes Ranke <jranke@uni-bremen.de>
@@ -59,5 +61,3 @@ vnoremap <buffer> r :w >> ~/.r-pipe<CR>
 
 " Write and process mode (somehow mapping <C-Enter> does not work)
 inoremap <M-Enter> <Esc>:execute line(".") 'w >> ~/.r-pipe'<CR>o
-
-endif
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index edd1f977..3c1e9032 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rst') != -1
+  finish
+endif
+
 " reStructuredText filetype plugin file
 " Language: reStructuredText documentation format
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
@@ -47,5 +49,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index 4c925fab..316a7296 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:		Ruby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -434,5 +436,3 @@ endfunction
 "
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index fa9e1562..ad325e67 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/rust.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 " Language:     Rust
 " Description:  Vim ftplugin for Rust
 " Maintainer:   Chris Morgan <me@chrismorgan.info>
@@ -201,5 +203,3 @@ 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 d30dd7d7..91bd3c31 100644
--- a/ftplugin/rust/tagbar.vim
+++ b/ftplugin/rust/tagbar.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
 "
@@ -40,5 +42,3 @@ 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 026e20cd..817b6f99 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:             Scala
 " Maintainer:           Derek Wyatt
@@ -176,5 +178,3 @@ 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 bb20242d..86995e0d 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 
 XPTemplate priority=lang
 
@@ -29,5 +31,3 @@ trait `derived^`trait^Component extends `trait^Component {
 		`body2^
 	}
 }
-
-endif
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index e6ab70e5..e53b5591 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
 "
@@ -31,5 +33,3 @@ 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 55519c31..c723d957 100644
--- a/ftplugin/scss.vim
+++ b/ftplugin/scss.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
+  finish
+endif
+
 if exists('b:did_indent') && b:did_indent
   " be kind. allow users to override this. Does it work?
   finish
@@ -13,5 +15,3 @@ setlocal formatoptions+=ro
 
 " SCSS comments are either /* */ or //
 setlocal comments=s1:/*,mb:*,ex:*/,://
-
-endif
diff --git a/ftplugin/slim.vim b/ftplugin/slim.vim
index 8de98c8a..83a768bf 100644
--- a/ftplugin/slim.vim
+++ b/ftplugin/slim.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slim') != -1
+  finish
+endif
+
 if exists("b:did_ftplugin")
   finish
 endif
@@ -25,5 +27,3 @@ let b:undo_ftplugin = "setl isk<" . " | " . s:undo_ftplugin
 
 setlocal iskeyword+=-
 setlocal commentstring=/%s
-
-endif
diff --git a/ftplugin/solidity.vim b/ftplugin/solidity.vim
index ebbe43b0..1971f587 100644
--- a/ftplugin/solidity.vim
+++ b/ftplugin/solidity.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
-  
-setlocal commentstring=//\ %s
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'solidity') != -1
+  finish
 endif
+
+setlocal commentstring=//\ %s
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index 0b29d266..7cd92a64 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'stylus') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language: Stylus
 " Maintainer: Marc Harter
@@ -63,5 +65,3 @@ 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 f24535e2..0d3eaafd 100644
--- a/ftplugin/swift.vim
+++ b/ftplugin/swift.vim
@@ -1,8 +1,8 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'swift') != -1
+  finish
+endif
+
 setlocal commentstring=//\ %s
 " @-@ adds the literal @ to iskeyword for @IBAction and similar
 setlocal iskeyword+=@-@,#
 setlocal completefunc=syntaxcomplete#Complete
-
-endif
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index c5c30627..e577c737 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
+  finish
+endif
+
 " terraform.vim - basic vim/terraform integration
 " Maintainer: HashiVim <https://github.com/hashivim>
 
@@ -71,5 +73,3 @@ augroup terraform
     autocmd BufWritePre *.tfvars call terraform#fmt()
   endif
 augroup END
-
-endif
diff --git a/ftplugin/tex_LatexBox.vim b/ftplugin/tex_LatexBox.vim
index 6c8899a6..ec85ba1d 100644
--- a/ftplugin/tex_LatexBox.vim
+++ b/ftplugin/tex_LatexBox.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box plugin for Vim
 " Maintainer: David Munger
 " Email: mungerd@gmail.com
@@ -33,5 +35,3 @@ 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 1e40f380..4741f852 100644
--- a/ftplugin/textile.vim
+++ b/ftplugin/textile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'textile') != -1
+  finish
+endif
+
 " textile.vim
 "
 " Tim Harper (tim.theenchanter.com)
@@ -59,5 +61,3 @@ function! TextileRenderBufferToTab()
   set syntax=html
 endfunction
 
-
-endif
diff --git a/ftplugin/tmux.vim b/ftplugin/tmux.vim
index fa2ae587..3dfb60fb 100644
--- a/ftplugin/tmux.vim
+++ b/ftplugin/tmux.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
-  
-setlocal commentstring=#\ %s
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'tmux') != -1
+  finish
 endif
+
+setlocal commentstring=#\ %s
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
index b440a714..e0b4adc1 100644
--- a/ftplugin/toml.vim
+++ b/ftplugin/toml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'toml') != -1
+  finish
+endif
+
 " File: ftplugin/toml.vim
 " Author: Kevin Ballard <kevin@sb.org>
 " Description: FileType Plugin for Toml
@@ -21,5 +23,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: set et sw=4 ts=4:
-
-endif
diff --git a/ftplugin/tt2html.vim b/ftplugin/tt2html.vim
index d0f02885..62461824 100644
--- a/ftplugin/tt2html.vim
+++ b/ftplugin/tt2html.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Language:      TT2 embedded with HTML
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
@@ -13,5 +15,3 @@ 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 fc406dba..086e938f 100644
--- a/ftplugin/twig.vim
+++ b/ftplugin/twig.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'twig') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language: Twig
 " Maintainer: F. Gabriel Gosselin <gabrielNOSPAM@evidens.ca>
@@ -40,5 +42,3 @@ else
 endif
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index 69631e13..705cb7cd 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
+  finish
+endif
+
 if exists("b:did_ftplugin")
   finish
 endif
@@ -21,5 +23,3 @@ let b:undo_ftplugin = "setl fo< ofu< com< cms<"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/vifm-cmdedit.vim b/ftplugin/vifm-cmdedit.vim
index 1634371e..14f70187 100644
--- a/ftplugin/vifm-cmdedit.vim
+++ b/ftplugin/vifm-cmdedit.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " vifm command-line editing buffer filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: August 18, 2013
@@ -19,5 +21,3 @@ 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 7303e1c6..f2021ed3 100644
--- a/ftplugin/vifm-edit.vim
+++ b/ftplugin/vifm-edit.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " vifm command-line editing buffer filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: August 18, 2013
@@ -13,5 +15,3 @@ 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 0cb82351..b7d0ed26 100644
--- a/ftplugin/vifm-rename.vim
+++ b/ftplugin/vifm-rename.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " Filetype plugin for vifm rename buffer
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: October 05, 2014
@@ -58,5 +60,3 @@ 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 055f0630..03e06e07 100644
--- a/ftplugin/vifm.vim
+++ b/ftplugin/vifm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " vifmrc filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: July 08, 2016
@@ -46,5 +48,3 @@ 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 194bf6fe..8aded135 100644
--- a/ftplugin/vue.vim
+++ b/ftplugin/vue.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vue') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language: Vue.js
 " Maintainer: Eduardo San Martin Morote
@@ -19,5 +21,3 @@ 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 ef365dc1..1b44ab93 100644
--- a/ftplugin/xs.vim
+++ b/ftplugin/xs.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:      XS (Perl extension interface language)
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -14,5 +16,3 @@ endif
 
 " Just use the C plugin for now.
 runtime! ftplugin/c.vim ftplugin/c_*.vim ftplugin/c/*.vim
-
-endif
-- 
cgit v1.2.3