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

---
 syntax/Jenkinsfile.vim       | 8 ++++----
 syntax/ansible.vim           | 8 ++++----
 syntax/ansible_hosts.vim     | 8 ++++----
 syntax/apiblueprint.vim      | 8 ++++----
 syntax/applescript.vim       | 8 ++++----
 syntax/arduino.vim           | 8 ++++----
 syntax/asciidoc.vim          | 8 ++++----
 syntax/blade.vim             | 8 ++++----
 syntax/c.vim                 | 8 ++++----
 syntax/cabal.vim             | 8 ++++----
 syntax/caddyfile.vim         | 8 ++++----
 syntax/carp.vim              | 8 ++++----
 syntax/clojure.vim           | 8 ++++----
 syntax/cmake.vim             | 8 ++++----
 syntax/coffee.vim            | 8 ++++----
 syntax/cpp.vim               | 8 ++++----
 syntax/cql.vim               | 8 ++++----
 syntax/cryptol.vim           | 8 ++++----
 syntax/crystal.vim           | 8 ++++----
 syntax/cucumber.vim          | 8 ++++----
 syntax/dart.vim              | 8 ++++----
 syntax/docker-compose.vim    | 8 ++++----
 syntax/dockerfile.vim        | 8 ++++----
 syntax/eelixir.vim           | 8 ++++----
 syntax/elixir.vim            | 8 ++++----
 syntax/elm.vim               | 8 ++++----
 syntax/ember-script.vim      | 8 ++++----
 syntax/emblem.vim            | 8 ++++----
 syntax/erlang.vim            | 8 ++++----
 syntax/eruby.vim             | 8 ++++----
 syntax/ferm.vim              | 8 ++++----
 syntax/fish.vim              | 8 ++++----
 syntax/fsharp.vim            | 8 ++++----
 syntax/git.vim               | 8 ++++----
 syntax/gitcommit.vim         | 8 ++++----
 syntax/gitconfig.vim         | 8 ++++----
 syntax/gitrebase.vim         | 8 ++++----
 syntax/gitsendemail.vim      | 8 ++++----
 syntax/glsl.vim              | 8 ++++----
 syntax/gmpl.vim              | 8 ++++----
 syntax/gnuplot.vim           | 8 ++++----
 syntax/go.vim                | 8 ++++----
 syntax/godebugoutput.vim     | 8 ++++----
 syntax/godebugstacktrace.vim | 8 ++++----
 syntax/godebugvariables.vim  | 8 ++++----
 syntax/godefstack.vim        | 8 ++++----
 syntax/gohtmltmpl.vim        | 8 ++++----
 syntax/gomod.vim             | 8 ++++----
 syntax/gotexttmpl.vim        | 8 ++++----
 syntax/graphql.vim           | 8 ++++----
 syntax/groovy.vim            | 8 ++++----
 syntax/haml.vim              | 8 ++++----
 syntax/haproxy.vim           | 8 ++++----
 syntax/haskell.vim           | 8 ++++----
 syntax/haxe.vim              | 8 ++++----
 syntax/html.vim              | 8 ++++----
 syntax/html/aria.vim         | 8 ++++----
 syntax/html/electron.vim     | 8 ++++----
 syntax/html/rdfa.vim         | 8 ++++----
 syntax/i3config.vim          | 8 ++++----
 syntax/jasmine.vim           | 8 ++++----
 syntax/javascript.vim        | 8 ++++----
 syntax/javascript/html5.vim  | 8 ++++----
 syntax/jinja2.vim            | 8 ++++----
 syntax/json.vim              | 8 ++++----
 syntax/json5.vim             | 8 ++++----
 syntax/jst.vim               | 8 ++++----
 syntax/julia.vim             | 8 ++++----
 syntax/juliadoc.vim          | 8 ++++----
 syntax/kotlin.vim            | 8 ++++----
 syntax/latextoc.vim          | 8 ++++----
 syntax/less.vim              | 8 ++++----
 syntax/liquid.vim            | 8 ++++----
 syntax/litcoffee.vim         | 8 ++++----
 syntax/ls.vim                | 8 ++++----
 syntax/lua.vim               | 8 ++++----
 syntax/mako.vim              | 8 ++++----
 syntax/markdown.vim          | 8 ++++----
 syntax/mason.vim             | 8 ++++----
 syntax/mma.vim               | 8 ++++----
 syntax/moon.vim              | 8 ++++----
 syntax/mustache.vim          | 8 ++++----
 syntax/nginx.vim             | 8 ++++----
 syntax/nim.vim               | 8 ++++----
 syntax/nix.vim               | 8 ++++----
 syntax/ocaml.vim             | 8 ++++----
 syntax/octave.vim            | 8 ++++----
 syntax/opencl.vim            | 8 ++++----
 syntax/org.vim               | 8 ++++----
 syntax/orgagenda.vim         | 8 ++++----
 syntax/orgtodo.vim           | 8 ++++----
 syntax/perl.vim              | 8 ++++----
 syntax/pgsql.vim             | 8 ++++----
 syntax/php.vim               | 8 ++++----
 syntax/plantuml.vim          | 8 ++++----
 syntax/pod.vim               | 8 ++++----
 syntax/pony.vim              | 8 ++++----
 syntax/proto.vim             | 8 ++++----
 syntax/ps1.vim               | 8 ++++----
 syntax/ps1xml.vim            | 8 ++++----
 syntax/pug.vim               | 8 ++++----
 syntax/puppet.vim            | 8 ++++----
 syntax/purescript.vim        | 8 ++++----
 syntax/python.vim            | 8 ++++----
 syntax/qml.vim               | 8 ++++----
 syntax/racket.vim            | 8 ++++----
 syntax/ragel.vim             | 8 ++++----
 syntax/raml.vim              | 8 ++++----
 syntax/rhelp.vim             | 8 ++++----
 syntax/rnoweb.vim            | 8 ++++----
 syntax/rst.vim               | 8 ++++----
 syntax/ruby.vim              | 8 ++++----
 syntax/rust.vim              | 8 ++++----
 syntax/sbt.vim               | 8 ++++----
 syntax/scala.vim             | 8 ++++----
 syntax/scss.vim              | 8 ++++----
 syntax/slim.vim              | 8 ++++----
 syntax/slime.vim             | 8 ++++----
 syntax/solidity.vim          | 8 ++++----
 syntax/stylus.vim            | 8 ++++----
 syntax/swift.vim             | 8 ++++----
 syntax/sxhkdrc.vim           | 8 ++++----
 syntax/systemd.vim           | 8 ++++----
 syntax/tap.vim               | 8 ++++----
 syntax/terraform.vim         | 8 ++++----
 syntax/textile.vim           | 8 ++++----
 syntax/thrift.vim            | 8 ++++----
 syntax/tmux.vim              | 8 ++++----
 syntax/tomdoc.vim            | 8 ++++----
 syntax/toml.vim              | 8 ++++----
 syntax/tt2.vim               | 8 ++++----
 syntax/tt2html.vim           | 8 ++++----
 syntax/tt2js.vim             | 8 ++++----
 syntax/twig.vim              | 8 ++++----
 syntax/typescript.vim        | 8 ++++----
 syntax/vala.vim              | 8 ++++----
 syntax/vbnet.vim             | 8 ++++----
 syntax/vcl.vim               | 8 ++++----
 syntax/velocity.vim          | 8 ++++----
 syntax/vifm.vim              | 8 ++++----
 syntax/vimgo.vim             | 8 ++++----
 syntax/vue.vim               | 8 ++++----
 syntax/xs.vim                | 8 ++++----
 syntax/xsl.vim               | 8 ++++----
 144 files changed, 576 insertions(+), 576 deletions(-)

(limited to 'syntax')

diff --git a/syntax/Jenkinsfile.vim b/syntax/Jenkinsfile.vim
index e0346763..84ab11d0 100644
--- a/syntax/Jenkinsfile.vim
+++ b/syntax/Jenkinsfile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jenkins') != -1
+  finish
+endif
+
 runtime syntax/groovy.vim
 syn keyword jenkinsfileBuiltInVariable currentBuild
 
@@ -126,5 +128,3 @@ hi link jenkinsFileDockerKeyword     jenkinsfilePipelineStep
 let b:current_syntax = 'Jenkinsfile'
 
 " vim:set et sw=0 ts=2 ft=vim tw=78:
-
-endif
diff --git a/syntax/ansible.vim b/syntax/ansible.vim
index 2f2d3b83..e6cb1565 100644
--- a/syntax/ansible.vim
+++ b/syntax/ansible.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
+
 " Vim syntax file
 " Language: Ansible YAML/Jinja templates
 " Maintainer: Dave Honneffer <pearofducks@gmail.com>
@@ -104,5 +106,3 @@ else
 endif
 
 let b:current_syntax = "ansible"
-
-endif
diff --git a/syntax/ansible_hosts.vim b/syntax/ansible_hosts.vim
index fde5bf6f..22791bda 100644
--- a/syntax/ansible_hosts.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language: Ansible hosts files
 " Maintainer: Dave Honneffer <pearofducks@gmail.com>
@@ -31,5 +33,3 @@ if exists("g:ansible_attribute_highlight")
 endif
 
 let b:current_syntax = "ansible_hosts"
-
-endif
diff --git a/syntax/apiblueprint.vim b/syntax/apiblueprint.vim
index 90d36386..282fa0fa 100644
--- a/syntax/apiblueprint.vim
+++ b/syntax/apiblueprint.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apiblueprint') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'apiblueprint') != -1
+  finish
+endif
+
 runtime! syntax/markdown.vim
 unlet! b:current_syntax
 
@@ -34,5 +36,3 @@ highlight default link apibActionRelationKey Identifier
 
 let b:current_syntax = 'apiblueprint'
 
-
-endif
diff --git a/syntax/applescript.vim b/syntax/applescript.vim
index d22b11b7..91597b61 100644
--- a/syntax/applescript.vim
+++ b/syntax/applescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'applescript') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    AppleScript
 " Maintainer:  Jim Eberle <jim.eberle@fastnlight.com>
@@ -245,5 +247,3 @@ hi def link scptTodo Todo
 
 let b:current_syntax = "applescript"
 
-
-endif
diff --git a/syntax/arduino.vim b/syntax/arduino.vim
index 4065608a..177b36db 100644
--- a/syntax/arduino.vim
+++ b/syntax/arduino.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'arduino') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    Arduino
 " Maintainer:  Sudar <sudar@sudarmuthu.com>
@@ -166,5 +168,3 @@ hi def link arduinoType Type
 hi def link arduinoConstant Constant
 hi def link arduinoFunc Function
 hi def link arduinoIdentifier Identifier
-
-endif
diff --git a/syntax/asciidoc.vim b/syntax/asciidoc.vim
index eec6529e..fcfda6b0 100644
--- a/syntax/asciidoc.vim
+++ b/syntax/asciidoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asciidoc') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'asciidoc') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     AsciiDoc
 " Author:       Stuart Rackham <srackham@gmail.com> (inspired by Felix
@@ -183,5 +185,3 @@ hi def link asciidocURL Macro
 let b:current_syntax = "asciidoc"
 
 " vim: wrap et sw=2 sts=2:
-
-endif
diff --git a/syntax/blade.vim b/syntax/blade.vim
index e517dd16..729bc118 100644
--- a/syntax/blade.vim
+++ b/syntax/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 syntax file
 " Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
@@ -72,5 +74,3 @@ let b:current_syntax = 'blade'
 if exists('main_syntax') && main_syntax == 'blade'
     unlet main_syntax
 endif
-
-endif
diff --git a/syntax/c.vim b/syntax/c.vim
index c37af28f..58a66daa 100644
--- a/syntax/c.vim
+++ b/syntax/c.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c/c++') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
@@ -489,5 +491,3 @@ unlet s:ft
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/cabal.vim b/syntax/cabal.vim
index 7a48a638..f1571f4a 100644
--- a/syntax/cabal.vim
+++ b/syntax/cabal.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
+  finish
+endif
+
 " syntax highlighting for cabal
 "
 " author: raichoo (raichoo@googlemail.com)
@@ -51,5 +53,3 @@ highlight def link cabalDocNewline Operator
 highlight def link cabalDocCode Macro
 
 let b:current_syntax = "cabal"
-
-endif
diff --git a/syntax/caddyfile.vim b/syntax/caddyfile.vim
index 4c22b017..aeec90b6 100644
--- a/syntax/caddyfile.vim
+++ b/syntax/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>
 
@@ -29,5 +31,3 @@ hi link caddyString String
 hi link caddyComment Comment
 
 let b:current_syntax = "caddyfile"
-
-endif
diff --git a/syntax/carp.vim b/syntax/carp.vim
index b91d41ae..c2b800b8 100644
--- a/syntax/carp.vim
+++ b/syntax/carp.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'carp') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'carp') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Carp
 " Maintainer:   Veit Heller <veit@veitheller.de>
@@ -143,5 +145,3 @@ if version >= 508 || !exists("carp_syntax_init")
 endif
 
 let b:current_syntax = "carp"
-
-endif
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index 758c1faf..12b526a3 100644
--- a/syntax/clojure.vim
+++ b/syntax/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 syntax file
 " Language:     Clojure
 " Authors:      Toralf Wittner <toralf.wittner@gmail.com>
@@ -223,5 +225,3 @@ let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif
diff --git a/syntax/cmake.vim b/syntax/cmake.vim
index cd722446..7b99c9ac 100644
--- a/syntax/cmake.vim
+++ b/syntax/cmake.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cmake') != -1
+  finish
+endif
+
 " Vim syntax file
 " Program:      CMake - Cross-Platform Makefile Generator
 " Version:      cmake version 3.13.20181220-g0495c
@@ -3283,5 +3285,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim: set nowrap:
-
-endif
diff --git a/syntax/coffee.vim b/syntax/coffee.vim
index b7494029..39b42058 100644
--- a/syntax/coffee.vim
+++ b/syntax/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
@@ -221,5 +223,3 @@ syn cluster coffeeAll contains=coffeeStatement,coffeeRepeat,coffeeConditional,
 if !exists('b:current_syntax')
   let b:current_syntax = 'coffee'
 endif
-
-endif
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index 67e3e5ac..092c21e2 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c/c++') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	C++
 " Current Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
@@ -76,5 +78,3 @@ hi def link cppNumber		Number
 let b:current_syntax = "cpp"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/cql.vim b/syntax/cql.vim
index 2607b025..df9a1c35 100644
--- a/syntax/cql.vim
+++ b/syntax/cql.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cql') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cql') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     cql
 " Maintainer:   Eric Lubow <eric@lubow.org
@@ -131,5 +133,3 @@ endif
 
 let b:current_syntax = "cql"
 
-
-endif
diff --git a/syntax/cryptol.vim b/syntax/cryptol.vim
index d7aaf180..9f3c611e 100644
--- a/syntax/cryptol.vim
+++ b/syntax/cryptol.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
+
 " Vim syntax file
 " Language:	Cryptol
 " Maintainer:	Fergus Henderson
@@ -113,5 +115,3 @@ endif
 let b:current_syntax = "cryptol"
 
 " Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
-
-endif
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index d972d3c3..13f23071 100644
--- a/syntax/crystal.vim
+++ b/syntax/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
+
 " Language: Crystal
 " Based on Ruby syntax highlight
 " which was made by Mirko Nasato and Doug Kearns
@@ -399,5 +401,3 @@ hi def link crystalSpaceError		crystalError
 let b:current_syntax = 'crystal'
 
 " vim: nowrap sw=2 sts=2 ts=8 noet:
-
-endif
diff --git a/syntax/cucumber.vim b/syntax/cucumber.vim
index 328d3912..496db9c7 100644
--- a/syntax/cucumber.vim
+++ b/syntax/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 syntax file
 " Language:     Cucumber
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
@@ -142,5 +144,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:set sts=2 sw=2:
-
-endif
diff --git a/syntax/dart.vim b/syntax/dart.vim
index 40dd0304..49e41193 100644
--- a/syntax/dart.vim
+++ b/syntax/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
+
 " Vim syntax file " Language: Dart
 " Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 " for details. All rights reserved. Use of this source code is governed by a
@@ -135,5 +137,3 @@ let b:spell_options = "contained"
 if g:main_syntax is# 'dart'
   unlet g:main_syntax
 endif
-
-endif
diff --git a/syntax/docker-compose.vim b/syntax/docker-compose.vim
index d94e3d50..abc7ca78 100644
--- a/syntax/docker-compose.vim
+++ b/syntax/docker-compose.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
+
 " Vim syntax file
 " Language: Dockerfile
 " Maintainer: Eugene Kalinin
@@ -85,5 +87,3 @@ set commentstring=#\ %s
 
 " Enable automatic comment insertion
 setlocal fo+=cro
-
-endif
diff --git a/syntax/dockerfile.vim b/syntax/dockerfile.vim
index 726240fa..1670c8f7 100644
--- a/syntax/dockerfile.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language: Dockerfile
 " Maintainer: Eugene Kalinin
@@ -64,5 +66,3 @@ set commentstring=#\ %s
 
 " Enable automatic comment insertion
 setlocal fo+=cro
-
-endif
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index febb8e8a..bd7f8611 100644
--- a/syntax/eelixir.vim
+++ b/syntax/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:current_syntax")
   finish
 endif
@@ -67,5 +69,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index 1fa114b1..a6e5991a 100644
--- a/syntax/elixir.vim
+++ b/syntax/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:current_syntax")
   finish
 endif
@@ -228,5 +230,3 @@ let b:current_syntax = "elixir"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/elm.vim b/syntax/elm.vim
index 67d737a8..687bee09 100644
--- a/syntax/elm.vim
+++ b/syntax/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
+
 " syntax highlighting for Elm (http://elm-lang.org/)
 
 if exists('b:current_syntax')
@@ -79,5 +81,3 @@ hi def link elmNumberType Identifier
 syn sync minlines=500
 
 let b:current_syntax = 'elm'
-
-endif
diff --git a/syntax/ember-script.vim b/syntax/ember-script.vim
index 6f6eadad..8869d757 100644
--- a/syntax/ember-script.vim
+++ b/syntax/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
@@ -31,5 +33,3 @@ syn match emEach /\v\@each/ display
 hi def link emEach Special
 
 let b:current_syntax = 'ember-script'
-
-endif
diff --git a/syntax/emblem.vim b/syntax/emblem.vim
index 012973a7..649e0208 100644
--- a/syntax/emblem.vim
+++ b/syntax/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
@@ -171,5 +173,3 @@ hi def link eblId       Constant
 hi def link eblClass    Identifier
 
 let b:current_syntax = 'emblem'
-
-endif
diff --git a/syntax/erlang.vim b/syntax/erlang.vim
index 11db9c57..1c549969 100644
--- a/syntax/erlang.vim
+++ b/syntax/erlang.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'erlang') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Erlang (http://www.erlang.org)
 " Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
@@ -261,5 +263,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 et
-
-endif
diff --git a/syntax/eruby.vim b/syntax/eruby.vim
index 1e760988..91246d0f 100644
--- a/syntax/eruby.vim
+++ b/syntax/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 syntax file
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -80,5 +82,3 @@ if main_syntax == 'eruby'
 endif
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/syntax/ferm.vim b/syntax/ferm.vim
index bfe1fd4d..ff87082c 100644
--- a/syntax/ferm.vim
+++ b/syntax/ferm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ferm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ferm') != -1
+  finish
+endif
+
 "============================================================================
 " ferm syntax highlighter
 "
@@ -203,5 +205,3 @@ endif
 " Autoconfigure vim indentation settings
 " vim:ts=4:sw=4:sts=4:fdm=marker:iskeyword+=-
 
-
-endif
diff --git a/syntax/fish.vim b/syntax/fish.vim
index f198dbaa..8ba62e14 100644
--- a/syntax/fish.vim
+++ b/syntax/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
+
 if exists('b:current_syntax')
     finish
 endif
@@ -37,5 +39,3 @@ highlight default link fishStatement Statement
 highlight default link fishCommandSub fishStatement
 
 let b:current_syntax = 'fish'
-
-endif
diff --git a/syntax/fsharp.vim b/syntax/fsharp.vim
index ae076b5d..16802018 100644
--- a/syntax/fsharp.vim
+++ b/syntax/fsharp.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fsharp') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     F#
 " Last Change:  Sun 19 Oct 2014 11:11:44 PM CEST
@@ -265,5 +267,3 @@ endif
 let b:current_syntax = 'fsharp'
 
 " vim: sw=4 et sts=4
-
-endif
diff --git a/syntax/git.vim b/syntax/git.vim
index 022c1dcc..686dcf80 100644
--- a/syntax/git.vim
+++ b/syntax/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 syntax file
 " Language:	generic git output
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -80,5 +82,3 @@ hi def link gitDiffAdded         diffAdded
 hi def link gitDiffRemoved       diffRemoved
 
 let b:current_syntax = "git"
-
-endif
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 1a1c3601..6bf31193 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/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 syntax file
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -91,5 +93,3 @@ hi def link gitcommitArrow		gitcommitComment
 hi def link gitcommitBlank		Error
 
 let b:current_syntax = "gitcommit"
-
-endif
diff --git a/syntax/gitconfig.vim b/syntax/gitconfig.vim
index fbdedc51..438cceae 100644
--- a/syntax/gitconfig.vim
+++ b/syntax/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 syntax file
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -36,5 +38,3 @@ hi def link gitconfigEscape		Delimiter
 hi def link gitconfigError		Error
 
 let b:current_syntax = "gitconfig"
-
-endif
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index da1c4a21..01b4cc0f 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/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 syntax file
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -44,5 +46,3 @@ hi def link gitrebaseComment        Comment
 hi def link gitrebaseSquashError    Error
 
 let b:current_syntax = "gitrebase"
-
-endif
diff --git a/syntax/gitsendemail.vim b/syntax/gitsendemail.vim
index 756f5da2..1d0b4c9b 100644
--- a/syntax/gitsendemail.vim
+++ b/syntax/gitsendemail.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 syntax file
 " Language:	git send-email message
 " Maintainer:	Tim Pope
@@ -23,5 +25,3 @@ syn match   gitsendemailComment "^GIT:.*"
 hi def link gitsendemailComment Comment
 
 let b:current_syntax = "gitsendemail"
-
-endif
diff --git a/syntax/glsl.vim b/syntax/glsl.vim
index 73c2afa1..2c9b08c5 100644
--- a/syntax/glsl.vim
+++ b/syntax/glsl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'glsl') != -1
+  finish
+endif
+
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
 
@@ -675,5 +677,3 @@ if !exists("b:current_syntax")
 endif
 
 " vim:set sts=2 sw=2 :
-
-endif
diff --git a/syntax/gmpl.vim b/syntax/gmpl.vim
index 2b8d7128..9eb26f8f 100644
--- a/syntax/gmpl.vim
+++ b/syntax/gmpl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gmpl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gmpl') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: GMPL
 " Maintainer: Mark Mba Wright
@@ -118,5 +120,3 @@ hi def link gmplType Type
 hi def link gmplLabel Keyword
 hi def link gmplString String
 hi def link gmplStringToken Special 
-
-endif
diff --git a/syntax/gnuplot.vim b/syntax/gnuplot.vim
index ff16f754..632719fd 100644
--- a/syntax/gnuplot.vim
+++ b/syntax/gnuplot.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gnuplot') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gnuplot') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	gnuplot 4.7.0
 " Maintainer:	Andrew Rasmussen andyras@users.sourceforge.net
@@ -554,5 +556,3 @@ endif
 let b:current_syntax = "gnuplot"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/go.vim b/syntax/go.vim
index a06f62d2..ca63c46c 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 " Copyright 2009 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
@@ -412,5 +414,3 @@ syn sync minlines=500
 let b:current_syntax = "go"
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godebugoutput.vim b/syntax/godebugoutput.vim
index f1df1d9e..c7fbd005 100644
--- a/syntax/godebugoutput.vim
+++ b/syntax/godebugoutput.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -13,5 +15,3 @@ hi def link godebugOutputErr Comment
 hi def link godebugOutputOut Normal
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godebugstacktrace.vim b/syntax/godebugstacktrace.vim
index b24f2a3c..dfc741dc 100644
--- a/syntax/godebugstacktrace.vim
+++ b/syntax/godebugstacktrace.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -11,5 +13,3 @@ let b:current_syntax = "godebugoutput"
 hi def link godebugStacktrace SpecialKey
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godebugvariables.vim b/syntax/godebugvariables.vim
index 0fdada88..853a4917 100644
--- a/syntax/godebugvariables.vim
+++ b/syntax/godebugvariables.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -23,5 +25,3 @@ hi def link goType Type
 hi def link goBoolean Boolean
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godefstack.vim b/syntax/godefstack.vim
index 0fad9561..69e10a3e 100644
--- a/syntax/godefstack.vim
+++ b/syntax/godefstack.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -20,5 +22,3 @@ hi def link godefStackFilename          Directory
 hi def link godefStackEntryLocationNumber LineNr
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/gohtmltmpl.vim b/syntax/gohtmltmpl.vim
index 22191178..565d9e02 100644
--- a/syntax/gohtmltmpl.vim
+++ b/syntax/gohtmltmpl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -17,5 +19,3 @@ syn cluster htmlPreproc add=gotplAction,goTplComment
 let b:current_syntax = "gohtmltmpl"
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/gomod.vim b/syntax/gomod.vim
index dde58b8b..6ec4838a 100644
--- a/syntax/gomod.vim
+++ b/syntax/gomod.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 " gomod.vim: Vim syntax file for go.mod file
 "
 " Quit when a (custom) syntax file was already loaded
@@ -62,5 +64,3 @@ syntax match gomodVersion "v[2-9]\{1}\d\?\.0\.0-\d\{14\}-\x\+\%(+incompatible\>\
 highlight default link gomodVersion Identifier
 
 let b:current_syntax = "gomod"
-
-endif
diff --git a/syntax/gotexttmpl.vim b/syntax/gotexttmpl.vim
index 11539355..7730af9c 100644
--- a/syntax/gotexttmpl.vim
+++ b/syntax/gotexttmpl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 " Copyright 2011 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
@@ -85,5 +87,3 @@ hi def link goTplComment Comment
 let b:current_syntax = "gotexttmpl"
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/graphql.vim b/syntax/graphql.vim
index b59151af..06223576 100644
--- a/syntax/graphql.vim
+++ b/syntax/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 syntax file
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -64,5 +66,3 @@ hi def link graphqlVariable         Identifier
 syn sync minlines=500
 
 let b:current_syntax = 'graphql'
-
-endif
diff --git a/syntax/groovy.vim b/syntax/groovy.vim
index 1a777cda..25dcf68a 100644
--- a/syntax/groovy.vim
+++ b/syntax/groovy.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'groovy') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	Groovy
 " Maintainer:	Alessio Pace <billy.corgan@tiscali.it>
@@ -450,5 +452,3 @@ endif
 let b:spell_options="contained"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/haml.vim b/syntax/haml.vim
index 721277ce..cd584cf9 100644
--- a/syntax/haml.vim
+++ b/syntax/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 syntax file
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -109,5 +111,3 @@ if main_syntax == "haml"
 endif
 
 " vim:set sw=2:
-
-endif
diff --git a/syntax/haproxy.vim b/syntax/haproxy.vim
index 54c54c3c..786c2fb8 100644
--- a/syntax/haproxy.vim
+++ b/syntax/haproxy.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haproxy') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haproxy') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    HAproxy
 " Maintainer:  Dan Reif
@@ -356,5 +358,3 @@ delcommand HiLink
 
 let b:current_syntax = "haproxy"
 " vim: ts=8
-
-endif
diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index 9ca4d89e..e86aa7c3 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
+  finish
+endif
+
 " syntax highlighting for haskell
 "
 " Heavily modified version of the haskell syntax
@@ -208,5 +210,3 @@ if get(g:, 'haskell_backpack', 0)
   highlight def link haskellBackpackDependency Include
 endif
 let b:current_syntax = "haskell"
-
-endif
diff --git a/syntax/haxe.vim b/syntax/haxe.vim
index c28e892d..b2c1606d 100644
--- a/syntax/haxe.vim
+++ b/syntax/haxe.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haxe') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haxe') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     haxe
 " Derived from:
@@ -427,5 +429,3 @@ if main_syntax == 'haxe'
   unlet main_syntax
 endif
 let b:spell_options="contained"
-
-endif
diff --git a/syntax/html.vim b/syntax/html.vim
index ee2323de..a0503612 100644
--- a/syntax/html.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language:     HTML (version 5.1)
 "               SVG (SVG 1.1 Second Edition)
@@ -190,5 +192,3 @@ syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemul
 syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
 syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
 
-
-endif
diff --git a/syntax/html/aria.vim b/syntax/html/aria.vim
index 3bb377ea..78106c17 100644
--- a/syntax/html/aria.vim
+++ b/syntax/html/aria.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
+
 " Vim syntax file
 " Language:     WAI-ARIA
 " Maintainer:  	othree <othree@gmail.com>
@@ -75,5 +77,3 @@ syn match    htmlArg contained "\<aria-\%(\|labelledby\|owns\|posinset\|setsize\
 syn match    htmlArg contained "\<aria-\%(\|colcount\|colindex\|colspan\)\>"
 syn match    htmlArg contained "\<aria-\%(\|rowcount\|rowindex\|rowspan\)\>"
 
-
-endif
diff --git a/syntax/html/electron.vim b/syntax/html/electron.vim
index 35e60dd4..64ed9e9b 100644
--- a/syntax/html/electron.vim
+++ b/syntax/html/electron.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
+
 " Vim syntax file
 " Language:     Electron
 " Maintainer:   othree <othree@gmail.com>
@@ -15,5 +17,3 @@ syn keyword htmlArg contained useragent disablewebsecurity partition allowpopups
 syn keyword htmlArg contained webpreferences blinkfeatures disableblinkfeatures
 syn keyword htmlArg contained guestinstance disableguestresize 
 
-
-endif
diff --git a/syntax/html/rdfa.vim b/syntax/html/rdfa.vim
index 3326a5df..4f32e783 100644
--- a/syntax/html/rdfa.vim
+++ b/syntax/html/rdfa.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
+
 " Vim syntax file
 " Language:     RDFa
 " Maintainer:   othree <othree@gmail.com>
@@ -11,5 +13,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " RDFa
 " http://www.w3.org/TR/rdfa-syntax/#s_syntax
 syn keyword htmlArg contained about content datatype href inlist prefix property rel resource rev src typeof vocab
-
-endif
diff --git a/syntax/i3config.vim b/syntax/i3config.vim
index 4763ba43..c77207ff 100644
--- a/syntax/i3config.vim
+++ b/syntax/i3config.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'i3') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: i3 config file
 " Maintainer: Mohamed Boughaba <mohamed dot bgb at gmail dot com>
@@ -250,5 +252,3 @@ hi! def link Variable Statement
 hi! def link ArbitraryCommand Type
 
 let b:current_syntax = "i3config"
-
-endif
diff --git a/syntax/jasmine.vim b/syntax/jasmine.vim
index eaa83d76..ea9aa976 100644
--- a/syntax/jasmine.vim
+++ b/syntax/jasmine.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jasmine') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jasmine') != -1
+  finish
+endif
+
 " Syntax highlighting for jasmine specs (used by http://github.com/thomd/vim-jasmine).
 
 " if b:current_syntax is defined, some other syntax files, earlier in 'runtimepath' was already loaded
@@ -84,5 +86,3 @@ hi def link jasmineSpecial Special
 hi def link jasmineSpy Special
 hi def link jasmineSpyMatcher Statement
 hi def link jasmineSuite Statement
-
-endif
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b0394caa..ad8a02d6 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     JavaScript
 " Maintainer:   vim-javascript community
@@ -391,5 +393,3 @@ let b:current_syntax = "javascript"
 if main_syntax == 'javascript'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/javascript/html5.vim b/syntax/javascript/html5.vim
index 3176e226..d8fb1ded 100644
--- a/syntax/javascript/html5.vim
+++ b/syntax/javascript/html5.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
+
 " Vim syntax file
 " Language:	    HTML5 New Stuff
 " Maintainer:	othree <othree@gmail.com>
@@ -49,5 +51,3 @@ syn keyword javascriptDomElemAttrs indeterminate
 
 " select https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
 syn keyword javascriptDomElemAttrs onselectstart onselectchange
-
-endif
diff --git a/syntax/jinja2.vim b/syntax/jinja2.vim
index 402bad56..bcdeacb1 100644
--- a/syntax/jinja2.vim
+++ b/syntax/jinja2.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
+
 " Vim syntax file
 " Language: Jinja2 - with special modifications for compound-filetype
 " compatibility
@@ -97,5 +99,3 @@ if !exists("did_jinja_syn_inits")
 endif
 
 let b:current_syntax = "jinja2"
-
-endif
diff --git a/syntax/json.vim b/syntax/json.vim
index e41dbb98..49a8df7b 100644
--- a/syntax/json.vim
+++ b/syntax/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
@@ -139,5 +141,3 @@ endif
 "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 "THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 "See https://twitter.com/elzr/status/294964017926119424
-
-endif
diff --git a/syntax/json5.vim b/syntax/json5.vim
index 15943f7f..f48c081f 100644
--- a/syntax/json5.vim
+++ b/syntax/json5.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json5') != -1
+  finish
+endif
+
 " Syntax setup {{{1
 if exists('b:current_syntax') && b:current_syntax == 'json5'
   finish
@@ -52,5 +54,3 @@ if !exists('b:current_syntax')
 endif
 
 " vim: fdm=marker
-
-endif
diff --git a/syntax/jst.vim b/syntax/jst.vim
index be4b0c0c..0059716a 100644
--- a/syntax/jst.vim
+++ b/syntax/jst.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jst') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -87,5 +89,3 @@ if exists("loaded_matchit")
 endif
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 5f40db60..3166c4ca 100644
--- a/syntax/julia.vim
+++ b/syntax/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 syntax file
 " Language:	julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
@@ -559,5 +561,3 @@ end
 syntax sync fromstart
 
 let b:current_syntax = "julia"
-
-endif
diff --git a/syntax/juliadoc.vim b/syntax/juliadoc.vim
index d886518d..91f930df 100644
--- a/syntax/juliadoc.vim
+++ b/syntax/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 syntax file for julia document view
 scriptencoding utf-8
 
@@ -65,5 +67,3 @@ highlight default link juliadocAdmonitionsType Todo
 highlight default link juliadocAdmonitionsTitle Title
 
 let b:current_syntax = "juliadoc"
-
-endif
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index a4019e55..5bef7152 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'kotlin') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Kotlin
 " Maintainer: Alexander Udalov
@@ -112,5 +114,3 @@ hi link ktFloat Float
 
 hi link ktExclExcl Special
 hi link ktArrow Structure
-
-endif
diff --git a/syntax/latextoc.vim b/syntax/latextoc.vim
index 0faca708..fbcbc01e 100644
--- a/syntax/latextoc.vim
+++ b/syntax/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
+
 syntax match helpText /^.*: .*/
 syntax match secNum /^\S\+\(\.\S\+\)\?\s*/ contained conceal
 syntax match secLine /^\S\+\t.\+/ contains=secNum
@@ -9,5 +11,3 @@ highlight link helpText		PreProc
 highlight link secNum		Number
 highlight link mainSecLine	Title
 highlight link ssubSecLine	Comment
-
-endif
diff --git a/syntax/less.vim b/syntax/less.vim
index c856e6af..b66f6421 100644
--- a/syntax/less.vim
+++ b/syntax/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
+
 if exists("b:current_syntax")
   finish
 endif
@@ -64,5 +66,3 @@ hi def link lessNestedProperty Type
 hi def link lessClass PreProc
 
 let b:current_syntax = "less"
-
-endif
diff --git a/syntax/liquid.vim b/syntax/liquid.vim
index fd09c7ce..1e2552cd 100644
--- a/syntax/liquid.vim
+++ b/syntax/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 syntax file
 " Language:     Liquid
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
@@ -138,5 +140,3 @@ let b:current_syntax = 'liquid'
 if exists('main_syntax') && main_syntax == 'liquid'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/litcoffee.vim b/syntax/litcoffee.vim
index 555518fa..38867403 100644
--- a/syntax/litcoffee.vim
+++ b/syntax/litcoffee.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:   Literate CoffeeScript
 " Maintainer: Michael Smith <michael@diglumi.com>
 " URL:        https://github.com/mintplant/vim-literate-coffeescript
@@ -23,5 +25,3 @@ syn region inlineCoffee start='^    \|\t' end='$' contains=@coffee
 highlight default link notCoffee Comment
 
 let b:current_syntax = "litcoffee"
-
-endif
diff --git a/syntax/ls.vim b/syntax/ls.vim
index c3edf65e..64e7905f 100644
--- a/syntax/ls.vim
+++ b/syntax/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
@@ -136,5 +138,3 @@ highlight default link lsSpaceError Error
 if !exists('b:current_syntax')
   let b:current_syntax = 'livescript'
 endif
-
-endif
diff --git a/syntax/lua.vim b/syntax/lua.vim
index 9ef55e4e..9f026bf3 100644
--- a/syntax/lua.vim
+++ b/syntax/lua.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lua') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lua') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Lua
 " URL: https://github.com/tbastos/vim-lua
@@ -247,5 +249,3 @@ let b:current_syntax = "lua"
 if main_syntax == 'lua'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/mako.vim b/syntax/mako.vim
index 0a2399b0..37b2a274 100644
--- a/syntax/mako.vim
+++ b/syntax/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 syntax file
 " Language:     Mako
 " Maintainer:   Armin Ronacher <armin.ronacher@active-4.com>
@@ -103,5 +105,3 @@ if version >= 508 || !exists("did_mako_syn_inits")
 endif
 
 let b:current_syntax = b:mako_outer_lang
-
-endif
diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index e59ffcae..b1758cd9 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'markdown') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	Markdown
 " Maintainer:	Ben Williams <benw@plasticboy.com>
@@ -184,5 +186,3 @@ let b:current_syntax = "mkd"
 
 delcommand HtmlHiLink
 " vim: ts=8
-
-endif
diff --git a/syntax/mason.vim b/syntax/mason.vim
index 8b8dc4d4..45586f31 100644
--- a/syntax/mason.vim
+++ b/syntax/mason.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 syntax file
 " Language:     Mason (Perl embedded in HTML)
 " Maintainer:   vim-perl <vim-perl@googlegroups.com>
@@ -83,5 +85,3 @@ let b:current_syntax = "mason"
 if main_syntax == 'mason'
 	unlet main_syntax
 endif
-
-endif
diff --git a/syntax/mma.vim b/syntax/mma.vim
index ceba976a..37d9e2a6 100644
--- a/syntax/mma.vim
+++ b/syntax/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 syntax file
 " Language: Mathematica
 " Maintainer: R. Menon <rsmenon@icloud.com>
@@ -169,5 +171,3 @@ let b:current_syntax = "mma"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/moon.vim b/syntax/moon.vim
index 327e1359..70ebeaf9 100644
--- a/syntax/moon.vim
+++ b/syntax/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>
@@ -317,5 +319,3 @@ syn cluster moonAll contains=moonStatement,moonRepeat,moonConditional,
 if !exists('b:current_syntax')
   let b:current_syntax = 'moon'
 endif
-
-endif
diff --git a/syntax/mustache.vim b/syntax/mustache.vim
index 6f18be0b..81b9f95b 100644
--- a/syntax/mustache.vim
+++ b/syntax/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
+
 " Mustache & Handlebars syntax
 " Language:	Mustache, Handlebars
 " Maintainer:	Juvenn Woo <machese@gmail.com>
@@ -91,5 +93,3 @@ syn region mustacheScriptTemplate start=+<script [^>]*type *=[^>]*text/\(mustach
 
 let b:current_syntax = "mustache"
 delcommand HtmlHiLink
-
-endif
diff --git a/syntax/nginx.vim b/syntax/nginx.vim
index 10d69b26..1c3e00d8 100644
--- a/syntax/nginx.vim
+++ b/syntax/nginx.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nginx') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: nginx.conf
 " Maintainer: Chris Aumann <me@chr4.org>
@@ -2305,5 +2307,3 @@ hi link ngxGzipOn Error
 hi link ngxSSLCipherInsecure Error
 
 hi link ngxThirdPartyLuaBlock Function
-
-endif
diff --git a/syntax/nim.vim b/syntax/nim.vim
index aa5396cf..7dbb18ab 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nim') != -1
+  finish
+endif
+
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 if version < 600
@@ -204,5 +206,3 @@ endif
 
 let b:current_syntax = "nim"
 
-
-endif
diff --git a/syntax/nix.vim b/syntax/nix.vim
index f67aa4c4..d69f49e0 100644
--- a/syntax/nix.vim
+++ b/syntax/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 syntax file
 " Language:    Nix
 " Maintainer:  Daiderd Jordan <daiderd@gmail.com>
@@ -196,5 +198,3 @@ hi def link nixWithExprKeyword           Keyword
 syn sync fromstart
 
 let b:current_syntax = "nix"
-
-endif
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index a337f547..c47cc8f2 100644
--- a/syntax/ocaml.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language:     OCaml
 " Filenames:    *.ml *.mli *.mll *.mly
@@ -331,5 +333,3 @@ endif
 let b:current_syntax = "ocaml"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/octave.vim b/syntax/octave.vim
index 3470afd1..1c63fbec 100644
--- a/syntax/octave.vim
+++ b/syntax/octave.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'octave') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'octave') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:             Octave
 " Maintainer:           Rik <rik@nomad.inbox5.com>
@@ -614,5 +616,3 @@ endif
 let b:current_syntax = "octave"
 
 "EOF	vim: ts=8 noet tw=100 sw=8 sts=0
-
-endif
diff --git a/syntax/opencl.vim b/syntax/opencl.vim
index b86e8eca..2d8b55a0 100644
--- a/syntax/opencl.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language:	OpenCL (Open Computing Language)
 " Maintainer:	Terence Ou (rivan_@msn.com)
@@ -157,5 +159,3 @@ hi def link clStatement         Statement
 let b:current_syntax = "opencl"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/org.vim b/syntax/org.vim
index 148e280e..3c5d8d23 100644
--- a/syntax/org.vim
+++ b/syntax/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
+
 " Support org authoring markup as closely as possible
 " (we're adding two markdown-like variants for =code= and blockquotes)
 " -----------------------------------------------------------------------------
@@ -383,5 +385,3 @@ if exists('g:loaded_SyntaxRange')
 endif
 
 " vi: ft=vim:tw=80:sw=4:ts=4:fdm=marker
-
-endif
diff --git a/syntax/orgagenda.vim b/syntax/orgagenda.vim
index 1f094ebf..e190633e 100644
--- a/syntax/orgagenda.vim
+++ b/syntax/orgagenda.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
+
 " TODO do we really need a separate syntax file for the agenda?
 "      - Most of the stuff here is also in syntax.org
 "      - DRY!
@@ -79,5 +81,3 @@ syntax match hyperlinkBracketsLeft		contained "\[\{2}" conceal
 syntax match hyperlinkURL				contained "[^][]*\]\[" conceal
 syntax match hyperlinkBracketsRight		contained "\]\{2}" conceal
 hi def link hyperlink Underlined
-
-endif
diff --git a/syntax/orgtodo.vim b/syntax/orgtodo.vim
index f2d7a687..6fba622c 100644
--- a/syntax/orgtodo.vim
+++ b/syntax/orgtodo.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
+
 syn match org_todo_key /\[\zs[^]]*\ze\]/
 hi def link org_todo_key Identifier
 
@@ -47,5 +49,3 @@ endif
 
 call s:ReadTodoKeywords(g:org_todo_keywords, s:todo_headings)
 unlet! s:todo_headings
-
-endif
diff --git a/syntax/perl.vim b/syntax/perl.vim
index a61a6486..bafa04ae 100644
--- a/syntax/perl.vim
+++ b/syntax/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 syntax file
 " Language:      Perl 5
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -582,5 +584,3 @@ unlet s:cpo_save
 
 " XXX Change to sts=4:sw=4
 " vim:ts=8:sts=2:sw=2:expandtab:ft=vim
-
-endif
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index ddd13e74..c4e2ab91 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pgsql') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     pgsql
 " Maintainer:   Devrim GUNDUZ <devrim@PostgreSQL.org>
@@ -2281,5 +2283,3 @@ let b:current_syntax = "pgsql"
 
 " Section: Modelines {{{1
 " vim600: set foldmethod=marker foldlevel=0 :
-
-endif
diff --git a/syntax/php.vim b/syntax/php.vim
index 29888a72..d5b10b2c 100644
--- a/syntax/php.vim
+++ b/syntax/php.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'php') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'php') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: PHP 5.3 & up
 "
@@ -958,5 +960,3 @@ endif
 " }}}
 
 " vim: ts=8 sts=2 sw=2 fdm=marker expandtab
-
-endif
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index b75ce52a..250e1734 100644
--- a/syntax/plantuml.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language:     PlantUML
 " Maintainer:   Anders Thøgersen <first name at bladre dot dk>
@@ -314,5 +316,3 @@ highlight default link plantumlStereotype Type
 
 let &cpo=s:cpo_orig
 unlet s:cpo_orig
-
-endif
diff --git a/syntax/pod.vim b/syntax/pod.vim
index 7ea78860..c85e5c57 100644
--- a/syntax/pod.vim
+++ b/syntax/pod.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 syntax file
 " Language:      Perl POD format
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -175,5 +177,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/pony.vim b/syntax/pony.vim
index 56899f8f..8035ca08 100644
--- a/syntax/pony.vim
+++ b/syntax/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 syntax file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -227,5 +229,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:current_syntax = 'pony'
-
-endif
diff --git a/syntax/proto.vim b/syntax/proto.vim
index 9c299770..70f776f7 100644
--- a/syntax/proto.vim
+++ b/syntax/proto.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'protobuf') != -1
+  finish
+endif
+
 " Protocol Buffers - Google's data interchange format
 " Copyright 2008 Google Inc.  All rights reserved.
 " https://developers.google.com/protocol-buffers/
@@ -107,5 +109,3 @@ if version >= 508 || !exists("did_proto_syn_inits")
 endif
 
 let b:current_syntax = "proto"
-
-endif
diff --git a/syntax/ps1.vim b/syntax/ps1.vim
index f69c0ceb..69819dca 100644
--- a/syntax/ps1.vim
+++ b/syntax/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 syntax file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -185,5 +187,3 @@ if version >= 508 || !exists("did_ps1_syn_inits")
 endif
 
 let b:current_syntax = "ps1"
-
-endif
diff --git a/syntax/ps1xml.vim b/syntax/ps1xml.vim
index 55c52d20..10565cde 100644
--- a/syntax/ps1xml.vim
+++ b/syntax/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 syntax file
 " Language:           Windows PowerShell XML
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -56,5 +58,3 @@ let b:current_syntax = "ps1xml"
 let &cpo = s:ps1xml_cpo_save
 unlet s:ps1xml_cpo_save
 
-
-endif
diff --git a/syntax/pug.vim b/syntax/pug.vim
index ba687390..49ed6da4 100644
--- a/syntax/pug.vim
+++ b/syntax/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 syntax file
 " Language: Pug
 " Maintainer: Joshua Borton
@@ -113,5 +115,3 @@ let b:current_syntax = "pug"
 if main_syntax == "pug"
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/puppet.vim b/syntax/puppet.vim
index 7128ea23..3cc1746e 100644
--- a/syntax/puppet.vim
+++ b/syntax/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
+
 " Language:     Puppet
 " Maintainer:   Voxpupuli
 " URL:          https://github.com/voxpupuli/vim-puppet
@@ -436,5 +438,3 @@ HiLink puppetComment              Comment
 delcommand HiLink
 
 let b:current_syntax = "puppet"
-
-endif
diff --git a/syntax/purescript.vim b/syntax/purescript.vim
index ff97d765..670d61ef 100644
--- a/syntax/purescript.vim
+++ b/syntax/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
+
 " syntax highlighting for purescript
 "
 " Heavily modified version of the purescript syntax
@@ -217,5 +219,3 @@ highlight def link purescriptType Type
 highlight def link purescriptComment Comment
 
 let b:current_syntax = "purescript"
-
-endif
diff --git a/syntax/python.vim b/syntax/python.vim
index 251b0f7d..5d14488d 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python') != -1
+  finish
+endif
+
 " For version 5.x: Clear all syntax items
 " For versions greater than 6.x: Quit when a syntax file was already loaded
 if v:version < 600
@@ -493,5 +495,3 @@ if v:version >= 508 || !exists('did_python_syn_inits')
 endif
 
 let b:current_syntax = 'python'
-
-endif
diff --git a/syntax/qml.vim b/syntax/qml.vim
index b34f23c2..9ff05e3e 100644
--- a/syntax/qml.vim
+++ b/syntax/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 syntax file
 " Language:     QML
 " Maintainer:   Peter Hoeg <peter@hoeg.com>
@@ -135,5 +137,3 @@ let b:current_syntax = "qml"
 if main_syntax == 'qml'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/racket.vim b/syntax/racket.vim
index 4ab9b63c..a84e1545 100644
--- a/syntax/racket.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
@@ -660,5 +662,3 @@ if version >= 508 || !exists("did_racket_syntax_inits")
 endif
 
 let b:current_syntax = "racket"
-
-endif
diff --git a/syntax/ragel.vim b/syntax/ragel.vim
index 6f6ddf50..1c7b8612 100644
--- a/syntax/ragel.vim
+++ b/syntax/ragel.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ragel') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ragel') != -1
+  finish
+endif
+
 " Vim syntax file
 "
 " Language: Ragel
@@ -164,5 +166,3 @@ hi link caseLabelKeyword Keyword
 hi link beginRL Type
  
 let b:current_syntax = "ragel"
-
-endif
diff --git a/syntax/raml.vim b/syntax/raml.vim
index db9e64bb..aec1d95a 100644
--- a/syntax/raml.vim
+++ b/syntax/raml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'raml') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    RAML (RESTful API Modeling Language)
 " Maintainer:  Eric Hopkins <eric.on.tech@gmail.com>
@@ -106,5 +108,3 @@ let b:current_syntax = "raml"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/rhelp.vim b/syntax/rhelp.vim
index ea4fca0d..417579d0 100644
--- a/syntax/rhelp.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language:    R Help File
 " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
@@ -155,5 +157,3 @@ endif
 
 let   b:current_syntax = "rhelp"
 " vim: foldmethod=marker:
-
-endif
diff --git a/syntax/rnoweb.vim b/syntax/rnoweb.vim
index 437c31cc..40a86b50 100644
--- a/syntax/rnoweb.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language:    R noweb Files
 " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
@@ -56,5 +58,3 @@ hi def link rnowebChunkReference Delimiter
 
 let   b:current_syntax = "rnoweb"
 " vim: foldmethod=marker:
-
-endif
diff --git a/syntax/rst.vim b/syntax/rst.vim
index 7d88963a..89f46e64 100644
--- a/syntax/rst.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language: reStructuredText documentation format
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
@@ -278,5 +280,3 @@ let b:current_syntax = "rst"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index 28c341b0..f3cf8c12 100644
--- a/syntax/ruby.vim
+++ b/syntax/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 syntax file
 " Language:		Ruby
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
@@ -558,5 +560,3 @@ unlet! s:cpo_sav
 delc SynFold
 
 " vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
-
-endif
diff --git a/syntax/rust.vim b/syntax/rust.vim
index 6803eb01..2a75c979 100644
--- a/syntax/rust.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language:     Rust
 " Maintainer:   Patrick Walton <pcwalton@mozilla.com>
@@ -351,5 +353,3 @@ syn sync maxlines=500
 let b:current_syntax = "rust"
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/syntax/sbt.vim b/syntax/sbt.vim
index e82e64d4..5d4cfba1 100644
--- a/syntax/sbt.vim
+++ b/syntax/sbt.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sbt') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'sbt') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     sbt
 " Maintainer:   Derek Wyatt <derek@{myfirstname}{mylastname}.org>
@@ -33,5 +35,3 @@ hi link sbtSpecial Special
 hi link sbtComment Comment
 hi link sbtLineComment Comment
 hi link sbtDocComment Comment
-
-endif
diff --git a/syntax/scala.vim b/syntax/scala.vim
index f551f37d..9555b5f3 100644
--- a/syntax/scala.vim
+++ b/syntax/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 syntax file
 " Language:             Scala
 " Maintainer:           Derek Wyatt
@@ -231,5 +233,3 @@ if main_syntax ==# 'scala'
 endif
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/syntax/scss.vim b/syntax/scss.vim
index 15b8359c..ba427ba6 100644
--- a/syntax/scss.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language:    SCSS (Sassy CSS)
 " Author:      Daniel Hofstetter (daniel.hofstetter@42dh.com)
@@ -221,5 +223,3 @@ let b:current_syntax = "scss"
 if main_syntax == 'scss'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/slim.vim b/syntax/slim.vim
index 3f33e17d..20733bad 100644
--- a/syntax/slim.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language: Slim
 " Maintainer: Andrew Stone <andy@stonean.com>
@@ -109,5 +111,3 @@ hi def link slimInlineTagChar             Delimiter
 hi def link slimFilter                    PreProc
 
 let b:current_syntax = "slim"
-
-endif
diff --git a/syntax/slime.vim b/syntax/slime.vim
index 57926691..d984aa49 100644
--- a/syntax/slime.vim
+++ b/syntax/slime.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slime') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slime') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: slime
 " Maintainer: Andrew Stone <andy@stonean.com>
@@ -102,5 +104,3 @@ hi def link slimeWrappedAttrsDelimiter     Delimiter
 hi def link slimeInlineTagChar             Delimiter
 
 let b:current_syntax = "slime"
-
-endif
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index c3bd8a7b..3ff61bf0 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'solidity') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Solidity
 " Maintainer:   Tomlion (qycpublic@gmail.com)
@@ -148,5 +150,3 @@ syn region  solComment           start="/\*"  end="\*/" contains=solCommentTodo,
 hi def link solCommentTodo       Comment
 hi def link solLineComment       Comment
 hi def link solComment           Comment
-
-endif
diff --git a/syntax/stylus.vim b/syntax/stylus.vim
index 6928c552..bd366007 100644
--- a/syntax/stylus.vim
+++ b/syntax/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 syntax file
 " Language:	CSS3
 " Maintainer:	Hsiaoming Yang <lepture@me.com>
@@ -376,5 +378,3 @@ hi def link stylusIdChar                Special
 let b:current_syntax = "stylus"
 
 " vim:set sw=2:
-
-endif
diff --git a/syntax/swift.vim b/syntax/swift.vim
index 7379d255..89c7ad3b 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'swift') != -1
+  finish
+endif
+
 " File: swift.vim
 " Author: Keith Smiley
 " Description: Runtime files for Swift
@@ -298,5 +300,3 @@ highlight default link swiftLineDirective PreProc
 syn sync minlines=100
 
 let b:current_syntax = "swift"
-
-endif
diff --git a/syntax/sxhkdrc.vim b/syntax/sxhkdrc.vim
index bb8ee95b..206497dd 100644
--- a/syntax/sxhkdrc.vim
+++ b/syntax/sxhkdrc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sxhkd') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'sxhkd') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
     finish
 endif
@@ -26,5 +28,3 @@ hi def link sxHotkeySep Delimiter
 hi def link sxSequenceSep Delimiter
 
 let b:current_syntax = "sxhkdrc"
-
-endif
diff --git a/syntax/systemd.vim b/syntax/systemd.vim
index 18568702..dc9686c4 100644
--- a/syntax/systemd.vim
+++ b/syntax/systemd.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemd') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'systemd') != -1
+  finish
+endif
+
 " Filename:     systemd.vim
 " Purpose:      Vim syntax file
 " Language:     systemd unit files
@@ -326,5 +328,3 @@ hi def link sdCapFlags          Identifier
 
 let b:current_syntax = "systemd"
 " vim: fdm=marker
-
-endif
diff --git a/syntax/tap.vim b/syntax/tap.vim
index ab42a324..136ed143 100644
--- a/syntax/tap.vim
+++ b/syntax/tap.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 syntax file
 " Language:    Verbose TAP Output
 " Maintainer:  Rufus Cable <rufus@threebytesfull.com>
@@ -97,5 +99,3 @@ if !exists("did_tapverboseoutput_syntax_inits")
 endif
 
 let b:current_syntax="tapVerboseOutput"
-
-endif
diff --git a/syntax/terraform.vim b/syntax/terraform.vim
index d9e59025..66d2c3a8 100644
--- a/syntax/terraform.vim
+++ b/syntax/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
+
 " Forked from Larry Gilbert's syntax file
 " github.com/L2G/vim-syntax-terraform
 
@@ -3357,5 +3359,3 @@ hi def link terraValueFunction     Identifier
 hi def link terraValueVarSubscript Identifier
 
 let b:current_syntax = "terraform"
-
-endif
diff --git a/syntax/textile.vim b/syntax/textile.vim
index d38cebf5..eccd7115 100644
--- a/syntax/textile.vim
+++ b/syntax/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
+
 "
 "   You will have to restart vim for this to take effect.  In any case
 "   it is a good idea to read ":he new-filetype" so that you know what
@@ -91,5 +93,3 @@ if version >= 508 || !exists("did_txt_syn_inits")
 endif
 
 " vim: set ai et sw=4 :
-
-endif
diff --git a/syntax/thrift.vim b/syntax/thrift.vim
index 64f51699..4c481332 100644
--- a/syntax/thrift.vim
+++ b/syntax/thrift.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'thrift') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'thrift') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Thrift
 " Maintainer: Martin Smith <martin@facebook.com>
@@ -98,5 +100,3 @@ endif
 
 let b:current_syntax = "thrift"
 
-
-endif
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index 64dd0e4f..8a8a5b2d 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'tmux') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: tmux(1) configuration file
 " Maintainer: Tiago Cunha <tcunha@users.sourceforge.net>
@@ -329,5 +331,3 @@ hi def link tmuxVariable		Constant
 hi def link tmuxVariableExpansion	Constant
 
 let b:current_syntax = 'tmux'
-
-endif
diff --git a/syntax/tomdoc.vim b/syntax/tomdoc.vim
index a2b2e6e0..b6d7ab21 100644
--- a/syntax/tomdoc.vim
+++ b/syntax/tomdoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tomdoc') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'tomdoc') != -1
+  finish
+endif
+
 syn keyword tomdocKeywords
       \ Returns Yields Raises Examples Signature
       \ containedin=.*Comment
@@ -18,5 +20,3 @@ syn match tomdocArguments
 hi default link tomdocDescriptions String
 hi default link tomdocKeywords String
 hi default link tomdocArguments HELP
-
-endif
diff --git a/syntax/toml.vim b/syntax/toml.vim
index 2c2b1083..839ea01e 100644
--- a/syntax/toml.vim
+++ b/syntax/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
+
 " Language:   TOML
 " Maintainer: Caleb Spare <cespare@gmail.com>
 " URL:        https://github.com/cespare/vim-toml
@@ -72,5 +74,3 @@ hi def link tomlComment Comment
 syn sync minlines=500
 
 let b:current_syntax = "toml"
-
-endif
diff --git a/syntax/tt2.vim b/syntax/tt2.vim
index 4f94834e..ccea0905 100644
--- a/syntax/tt2.vim
+++ b/syntax/tt2.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 (Perl Template Toolkit)
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Author:        Moriki, Atsushi <4woods+vim@gmail.com>
@@ -210,5 +212,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=4:sw=4
-
-endif
diff --git a/syntax/tt2html.vim b/syntax/tt2html.vim
index 9d14c66d..0ee06595 100644
--- a/syntax/tt2html.vim
+++ b/syntax/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>
 " Author:        Moriki, Atsushi <4woods+vim@gmail.com>
@@ -20,5 +22,3 @@ unlet b:current_syntax
 syn cluster htmlPreProc add=@tt2_top_cluster
 
 let b:current_syntax = "tt2html"
-
-endif
diff --git a/syntax/tt2js.vim b/syntax/tt2js.vim
index 06086280..35849b62 100644
--- a/syntax/tt2js.vim
+++ b/syntax/tt2js.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 Javascript
 " Maintainer:    Andy Lester <andy@petdance.com>
 " Author:        Yates, Peter <pd.yates@gmail.com>
@@ -20,5 +22,3 @@ unlet b:current_syntax
 syn cluster javascriptPreProc add=@tt2_top_cluster
 
 let b:current_syntax = "tt2js"
-
-endif
diff --git a/syntax/twig.vim b/syntax/twig.vim
index 3388f3b2..5b2fc92b 100644
--- a/syntax/twig.vim
+++ b/syntax/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 syntax file
 " Language:	Twig template
 " Maintainer:	Gabriel Gosselin <gabrielNOSPAM@evidens.ca>
@@ -114,5 +116,3 @@ if version >= 508 || !exists("did_twig_syn_inits")
 
   delcommand HiLink
 endif
-
-endif
diff --git a/syntax/typescript.vim b/syntax/typescript.vim
index b8f31800..001f91dd 100644
--- a/syntax/typescript.vim
+++ b/syntax/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
+
 " Vim syntax file
 " Language: typescript
 " Author: MicroSoft Open Technologies Inc.
@@ -339,5 +341,3 @@ if main_syntax == 'typescript'
 endif
 
 " vim: ts=4
-
-endif
diff --git a/syntax/vala.vim b/syntax/vala.vim
index eb67a822..f49b32a1 100644
--- a/syntax/vala.vim
+++ b/syntax/vala.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vala') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	Vala
 " Maintainers:	Emmanuele Bassi <ebassi@gnome.org>
@@ -226,5 +228,3 @@ let &cpo = s:vala_cpo_save
 unlet s:vala_cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/vbnet.vim b/syntax/vbnet.vim
index c60772dc..c9550284 100644
--- a/syntax/vbnet.vim
+++ b/syntax/vbnet.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vbnet') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vbnet') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     VB.NET
 " Maintainer:   Tim Pope <vim@rebelongto.us>
@@ -431,5 +433,3 @@ endif
 let b:current_syntax = "vbnet"
 
 " vim:set ft=vim sts=4 sw=4:
-
-endif
diff --git a/syntax/vcl.vim b/syntax/vcl.vim
index 3bd91a5c..66772576 100644
--- a/syntax/vcl.vim
+++ b/syntax/vcl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vcl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vcl') != -1
+  finish
+endif
+
 " Vim syntax file
 " Filename:     vcl.vim
 " Language:     Varnish configuation Language, http://www.varnish-cache.org/wiki/VCL
@@ -106,5 +108,3 @@ hi link vclModes            Operator
 hi link vclOption           Identifier
 hi link vclNumber           Number
 hi link vclNumberTime       Number
-
-endif
diff --git a/syntax/velocity.vim b/syntax/velocity.vim
index 01fff656..44f78250 100644
--- a/syntax/velocity.vim
+++ b/syntax/velocity.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vm') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	Velocity HTML template
 " Maintainer:	Hsiaoming Young <http://lepture.com>
@@ -67,5 +69,3 @@ if version >= 508 || !exists("did_velocity_syn_inits")
 endif
 
 let b:current_syntax = "velocity"
-
-endif
diff --git a/syntax/vifm.vim b/syntax/vifm.vim
index 00099e1c..26d163ff 100644
--- a/syntax/vifm.vim
+++ b/syntax/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
+
 " vifm syntax file
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: January 31, 2019
@@ -451,5 +453,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/syntax/vimgo.vim b/syntax/vimgo.vim
index 811cd683..38040319 100644
--- a/syntax/vimgo.vim
+++ b/syntax/vimgo.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -13,5 +15,3 @@ hi def link goInterface Type
 hi def link goTitle Label
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/vue.vim b/syntax/vue.vim
index 697ca83f..a7fd0733 100644
--- a/syntax/vue.vim
+++ b/syntax/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 syntax file
 " Language: Vue.js
 " Maintainer: Eduardo San Martin Morote
@@ -63,5 +65,3 @@ syn keyword htmlArg             contained scoped ts
 syn match   htmlArg "[@v:][-:.0-9_a-z]*\>" contained
 
 let b:current_syntax = "vue"
-
-endif
diff --git a/syntax/xs.vim b/syntax/xs.vim
index 82fd1a33..1be78c27 100644
--- a/syntax/xs.vim
+++ b/syntax/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 syntax file
 " Language:    XS (Perl extension interface language)
 " Author:      Autogenerated from perl headers, on an original basis of Michael W. Dodge <sarge@pobox.com>
@@ -3677,5 +3679,3 @@ hi def link xsMacro      Macro
 let b:current_syntax = "xs"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/xsl.vim b/syntax/xsl.vim
index 0725324c..e40b6811 100644
--- a/syntax/xsl.vim
+++ b/syntax/xsl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xls') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'xls') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	XSLT 1.0
 " with HTML, CSS, JavaScript, PerlScript, VBScript and MSXSL extention
@@ -537,5 +539,3 @@ let b:current_syntax = "xsl"
 "unlet s:xml_cpo_save
 
 " vim: ts=4:sw=4
-
-endif
-- 
cgit v1.2.3