Improve guard to support concatenated files

93 files changed, 186 insertions, 373 deletions

diff --git a/indent/Dockerfile.vim b/indent/Dockerfile.vim
index 1eefd26a..c6e62f1b 100644
--- a/indent/Dockerfile.vim
+++ b/indent/Dockerfile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 if exists('b:did_indent') | finish | endif
 let b:did_indent = 1
 
@@ -25,3 +22,4 @@ endfunction
 
 
 set indentexpr=DockerfileIndent(v:lnum)
+endif
diff --git a/indent/Jenkinsfile.vim b/indent/Jenkinsfile.vim
index 79d09bb8..150a6604 100644
--- a/indent/Jenkinsfile.vim
+++ b/indent/Jenkinsfile.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jenkins') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
 runtime indent/groovy.vim
+endif
diff --git a/indent/ansible.vim b/indent/ansible.vim
index e8ad6a73..bc224e3a 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -61,3 +58,4 @@ function GetAnsibleIndent(lnum)
 endfunction
 
 let &cpo = s:save_cpo
+endif
diff --git a/indent/applescript.vim b/indent/applescript.vim
index 41b9884b..c5435824 100644
--- a/indent/applescript.vim
+++ b/indent/applescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'applescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
 "Plugin Name: applescript indent file.
 "Author: mityu
 "Last Change: 02-May-2017.
@@ -79,3 +76,4 @@ let &cpo=s:cpo_save
 unlet s:cpo_save
 
 " vim: foldmethod=marker
+endif
diff --git a/indent/arduino.vim b/indent/arduino.vim
index d29cbba7..6432bc4c 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'arduino') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
 " Vim indent file
 " Language:	Arduino
 " Maintainer:	Kevin Sjöberg <kev.sjoberg@gmail.com>
@@ -17,3 +14,4 @@ let b:did_indent = 1
 setlocal cindent
 
 let b:undo_indent = "setl cin<"
+endif
diff --git a/indent/autohotkey.vim b/indent/autohotkey.vim
index c04d94dd..4fb87f0b 100644
--- a/indent/autohotkey.vim
+++ b/indent/autohotkey.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'autohotkey') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autohotkey') == -1
 " Vim indent file
 " Language:   AutoHotkey
 " Maintainer: Hirotoshi Namikawa <hnamikaw1@gmail.com>
@@ -221,3 +218,4 @@ function! GetAutoHotkeyIndent()
 endfunction
 
 let b:did_indent = 1
+endif
diff --git a/indent/blade.vim b/indent/blade.vim
index cd865cd9..6e4e631c 100644
--- a/indent/blade.vim
+++ b/indent/blade.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'blade') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 " Vim indent file
 " Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
@@ -97,3 +94,4 @@ function! GetBladeIndent()
 
     return indent
 endfunction
+endif
diff --git a/indent/cabal.vim b/indent/cabal.vim
index e4d80e82..2e1619e0 100644
--- a/indent/cabal.vim
+++ b/indent/cabal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 " indentation for cabal
 "
 " author: raichoo (raichoo@googlemail.com)
@@ -33,3 +30,4 @@ function! GetCabalIndent()
     return match(l:prevline, '\S')
   endif
 endfunction
+endif
diff --git a/indent/caddyfile.vim b/indent/caddyfile.vim
index 885a9495..ca24b9fe 100644
--- a/indent/caddyfile.vim
+++ b/indent/caddyfile.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'caddyfile') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 if exists('b:did_indent')
 	finish
 endif
@@ -43,3 +40,4 @@ function! GetCaddyfileIndent(lnum)
 
 	return ind
 endfunction
+endif
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 4ad30821..9aa7fdbc 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 " Vim indent file
 " Language:     Clojure
 " Author:       Meikel Brandmeyer <mb@kotka.de>
@@ -405,3 +402,4 @@ let &cpo = s:save_cpo
 unlet! s:save_cpo
 
 " vim:sts=8:sw=8:ts=8:noet
+endif
diff --git a/indent/cmake.vim b/indent/cmake.vim
index 2ab2dc34..f84b5cdf 100644
--- a/indent/cmake.vim
+++ b/indent/cmake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cmake') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
 " Vim indent file
 " Language:     CMake (ft=cmake)
 " Author:       Andy Cedilnik <andy.cedilnik@kitware.com>
@@ -91,3 +88,4 @@ endfun
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
+endif
diff --git a/indent/coffee.vim b/indent/coffee.vim
index bf39c733..0d0f1ba6 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -430,3 +427,4 @@ function! GetCoffeeIndent(curlnum)
   " No special rules applied, so use the default policy.
   exec 'return' s:GetDefaultPolicy(a:curlnum)
 endfunction
+endif
diff --git a/indent/crystal.vim b/indent/crystal.vim
index 836a9369..177462e5 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
   finish
@@ -637,3 +634,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
+endif
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index e4ad953e..ea098447 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 " Vim indent file
 " Language:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -77,3 +74,4 @@ function! GetCucumberIndent()
 endfunction
 
 " vim:set sts=2 sw=2:
+endif
diff --git a/indent/cython.vim b/indent/cython.vim
index 2b8fef1e..2bf211d8 100644
--- a/indent/cython.vim
+++ b/indent/cython.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-indent') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-indent') == -1
 " PEP8 compatible Python indent file
 " Language:         Python
 " Maintainer:       Daniel Hahler <https://daniel.hahler.de/>
@@ -456,3 +453,4 @@ function! GetPythonPEPIndent(lnum)
 
     return s:indent_like_previous_line(a:lnum)
 endfunction
+endif
diff --git a/indent/d.vim b/indent/d.vim
index 13a6ddf8..878b4c28 100644
--- a/indent/d.vim
+++ b/indent/d.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dlang') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 " Vim indent file for the D programming language (version 1.076 and 2.063).
 "
 " Language:     D
@@ -79,3 +76,4 @@ function GetDIndent()
 
   return cind
 endfunction
+endif
diff --git a/indent/dart.vim b/indent/dart.vim
index 1900e99c..b7a932f9 100644
--- a/indent/dart.vim
+++ b/indent/dart.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 if exists('b:did_indent')
   finish
 endif
@@ -37,3 +34,4 @@ function! DartIndent()
 
   return indentTo
 endfunction
+endif
diff --git a/indent/dune.vim b/indent/dune.vim
index 3f8e7e87..6f3e709b 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim indent file
 " Language: dune
 
@@ -12,3 +9,4 @@ let b:did_indent = 1
 
 " dune format-dune-file uses 1 space to indent
 set softtabstop=1 shiftwidth=1 expandtab
+endif
diff --git a/indent/eelixir.vim b/indent/eelixir.vim
index 0c98c162..5ad0fd77 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists("b:did_indent")
   finish
 endif
@@ -74,3 +71,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/elixir.vim b/indent/elixir.vim
index b2aa7ea7..212070df 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists("b:did_indent")
   finish
 end
@@ -17,3 +14,4 @@ setlocal indentkeys+=*<Return>,=->,=\|>,=<>,0},0],0)
 function! elixir#indent(lnum)
   return elixir#indent#indent(a:lnum)
 endfunction
+endif
diff --git a/indent/elm.vim b/indent/elm.vim
index db86e289..d4ebdb60 100644
--- a/indent/elm.vim
+++ b/indent/elm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 " indentation for Elm (http://elm-lang.org/)
 
 " Only load this indent file when no other was loaded.
@@ -113,3 +110,4 @@ function! GetElmIndent()
 
 	return l:ind
 endfunc
+endif
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index 8a28d875..618d4193 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emberscript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
 " URL:         http://github.com/yalesov/vim-ember-script
@@ -16,3 +13,4 @@ endif
 runtime! indent/coffee.vim
 unlet! b:did_indent
 let b:did_indent = 1
+endif
diff --git a/indent/emblem.vim b/indent/emblem.vim
index 67132c0c..4a1fea00 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.vim
@@ -1,10 +1,8 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emblem') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
 " URL:         http://github.com/yalesov/vim-emblem
 " Version:     2.0.1
 " Last Change: 2016 Jul 6
 " License:     ISC
+endif
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 04eb2d44..7c3f6b5c 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'erlang') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 " Vim indent file
 " Language:     Erlang (http://www.erlang.org)
 " Author:       Csaba Hoch <csaba.hoch@gmail.com>
@@ -1485,3 +1482,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 et fdm=marker
+endif
diff --git a/indent/eruby.vim b/indent/eruby.vim
index 7d3966cb..c6cbb3d8 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim indent file
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -112,3 +109,4 @@ let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
 " vim:set sw=2 sts=2 ts=8 noet:
+endif
diff --git a/indent/fish.vim b/indent/fish.vim
index dfdd5bca..3b0b62b4 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -1,6 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 setlocal indentexpr=fish#Indent()
 setlocal indentkeys+==end,=else,=case
+endif
diff --git a/indent/fsharp.vim b/indent/fsharp.vim
index b227cec0..0d320253 100644
--- a/indent/fsharp.vim
+++ b/indent/fsharp.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fsharp') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
 " Vim indent file
 " Language:     FSharp
 " Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
@@ -251,3 +248,4 @@ function! GetFsharpIndent()
 endfunction
 
 " vim: sw=4 et sts=4
+endif
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index fd2ed5a9..0a156511 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Vim indent file
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -40,3 +37,4 @@ function! GetGitconfigIndent()
     return -1
   endif
 endfunction
+endif
diff --git a/indent/glsl.vim b/indent/glsl.vim
index 7690e654..657b1275 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'glsl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
 
@@ -13,3 +10,4 @@ setlocal autoindent cindent
 setlocal formatoptions+=roq
 
 " vim:set sts=2 sw=2 :
+endif
diff --git a/indent/go.vim b/indent/go.vim
index 8847a118..81d33a08 100644
--- a/indent/go.vim
+++ b/indent/go.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 " 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.
@@ -88,3 +85,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/indent/gohtmltmpl.vim b/indent/gohtmltmpl.vim
index 60c38fe0..2988cfc8 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 if exists("b:did_indent")
   finish
 endif
@@ -56,3 +53,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/indent/graphql.vim b/indent/graphql.vim
index 1bf93abb..71076764 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 " Vim indent file
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -79,3 +76,4 @@ endfunction
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/groovy.vim b/indent/groovy.vim
index 3143239e..0f1bafd7 100644
--- a/indent/groovy.vim
+++ b/indent/groovy.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'groovy-indent') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy-indent') == -1
 " Vim indent file
 " Language:	Groovy
 " Maintainer:	Toby Allsopp <toby.allsopp@peace.com> (resigned)
@@ -165,3 +162,4 @@ function GetGroovyIndent()
 endfunction
 
 " vi: sw=2 et
+endif
diff --git a/indent/haml.vim b/indent/haml.vim
index c5c73c88..55bd0d2e 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 " Vim indent file
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -76,3 +73,4 @@ function! GetHamlIndent()
 endfunction
 
 " vim:set sw=2:
+endif
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
index 2253a7a3..eb7a9b78 100644
--- a/indent/handlebars.vim
+++ b/indent/handlebars.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'handlebars') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 " Mustache & Handlebars syntax
 " Language:	Mustache, Handlebars
 " Maintainer:	Juvenn Woo <machese@gmail.com>
@@ -127,3 +124,4 @@ function! GetHandlebarsIndent(...)
 
   return ind
 endfunction
+endif
diff --git a/indent/haskell.vim b/indent/haskell.vim
index a3f1be3e..e752f8d8 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 " indentation for haskell
 "
 " author: raichoo (raichoo@googlemail.com)
@@ -511,3 +508,4 @@ function! GetHaskellIndent()
 
   return -1
 endfunction
+endif
diff --git a/indent/hcl.vim b/indent/hcl.vim
index e4a16819..5b8b8fde 100644
--- a/indent/hcl.vim
+++ b/indent/hcl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'hcl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 if exists('b:did_indent')
   finish
 endif
@@ -13,3 +10,4 @@ setlocal cindent
 
 " don't de-indent comments (cindent treats them like preprocessor directives)
 setlocal cinkeys-=0#
+endif
diff --git a/indent/html.vim b/indent/html.vim
index 25389520..55c63200 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim indent script for HTML
 " Header: "{{{
 " Maintainer:	Bram Moolenaar
@@ -1063,3 +1060,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: fdm=marker ts=8 sw=2 tw=78
+endif
diff --git a/indent/idris.vim b/indent/idris.vim
index b7b9015d..86aae692 100644
--- a/indent/idris.vim
+++ b/indent/idris.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'idris') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 " indentation for idris (idris-lang.org)
 "
 " Based on haskell indentation by motemen <motemen@gmail.com>
@@ -146,3 +143,4 @@ function! GetIdrisIndent()
 
   return match(prevline, '\S')
 endfunction
+endif
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 49154dbb..cda92db9 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 " Vim indent file
 " Language: Javascript
 " Maintainer: Chris Paul ( https://github.com/bounceme )
@@ -479,3 +476,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/jinja.vim b/indent/jinja.vim
index 759d3ee9..94f70ce5 100644
--- a/indent/jinja.vim
+++ b/indent/jinja.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jinja') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
 " Vim indent file
 " Language:	Jinja HTML template
 " Maintainer:	Evan Hammer <evan@evanhammer.com>
@@ -82,3 +79,4 @@ function! GetDjangoIndent(...)
 
     return ind
 endfunction
+endif
diff --git a/indent/json.vim b/indent/json.vim
index 9a4f8bde..460cb049 100644
--- a/indent/json.vim
+++ b/indent/json.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 " Vim indent file
 " Language:		JSON
 " Mantainer:		Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
@@ -179,3 +176,4 @@ unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
+endif
diff --git a/indent/jst.vim b/indent/jst.vim
index 493bbdae..806033dd 100644
--- a/indent/jst.vim
+++ b/indent/jst.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jst') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
 if exists("b:did_indent")
   finish
 endif
@@ -77,3 +74,4 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
+endif
diff --git a/indent/julia.vim b/indent/julia.vim
index b8453f73..1d5e5d0f 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 " Vim indent file
 " Language:	Julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
@@ -387,3 +384,4 @@ function GetJuliaIndent()
 
   return ind
 endfunction
+endif
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index 56211b36..e574c006 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'kotlin') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 " Vim indent file
 " Language: Kotlin
 " Maintainer: Alexander Udalov
@@ -58,3 +55,4 @@ function! GetKotlinIndent()
 
     return prev_indent
 endfunction
+endif
diff --git a/indent/less.vim b/indent/less.vim
index afb048b4..44f6fc02 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 " Vim indent file
 " Language:            LessCSS
 " Maintainer:        Leonard Ehrenfried <leonard.ehrenfried@web.de>
@@ -11,4 +8,4 @@ if exists("b:did_indent")
   finish
 endif
 
-runtime! indent/css.vim
\ No newline at end of file
+runtime! indent/css.vimendif
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
index 169a6758..8e2ca02a 100644
--- a/indent/lilypond.vim
+++ b/indent/lilypond.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lilypond') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 " LilyPond indent file
 " Language:     LilyPond
 " Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
@@ -62,3 +59,4 @@ endfunction
 "
 "
 "
+endif
diff --git a/indent/litcoffee.vim b/indent/litcoffee.vim
index ca747ea0..d8382308 100644
--- a/indent/litcoffee.vim
+++ b/indent/litcoffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 if exists('b:did_indent')
   finish
 endif
@@ -24,3 +21,4 @@ function GetLitCoffeeIndent()
   endif
 endfunc
 
+endif
diff --git a/indent/llvm.vim b/indent/llvm.vim
index 90829c25..94c89a04 100644
--- a/indent/llvm.vim
+++ b/indent/llvm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'llvm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 " Vim indent file
 " Language:   llvm
 " Maintainer: The LLVM team, http://llvm.org/
@@ -74,3 +71,4 @@ function! GetLLVMIndent()
 
   return ind
 endfunction
+endif
diff --git a/indent/ls.vim b/indent/ls.vim
index 975c5dab..0f2d7b22 100644
--- a/indent/ls.vim
+++ b/indent/ls.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 " Language:    LiveScript
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -266,3 +263,4 @@ function! GetLiveScriptIndent(curlinenum)
 
   return indent
 endfunction
+endif
diff --git a/indent/lua.vim b/indent/lua.vim
index 5f37ae03..4bd6e2b4 100644
--- a/indent/lua.vim
+++ b/indent/lua.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lua') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lua') == -1
 " Vim indent file
 " Language: Lua
 " URL: https://github.com/tbastos/vim-lua
@@ -118,3 +115,4 @@ function GetLuaIndent()
   return indent(prev_line) + (shiftwidth() * i)
 
 endfunction
+endif
diff --git a/indent/mako.vim b/indent/mako.vim
index 48b5c5c5..c99202f6 100644
--- a/indent/mako.vim
+++ b/indent/mako.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mako') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 " Vim indent file
 " Language: Mako
 " Author: Scott Torborg <storborg@mit.edu>
@@ -430,3 +427,4 @@ fun! <SID>HtmlIndentSum(lnum, style)
 endfun
 
 " vim: set ts=4 sw=4:
+endif
diff --git a/indent/markdown.vim b/indent/markdown.vim
index 3bba57ac..60205111 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'markdown') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
 if exists("b:did_indent") | finish | endif
 let b:did_indent = 1
 
@@ -77,3 +74,4 @@ function GetMarkdownIndent()
         return ind
     endif
 endfunction
+endif
diff --git a/indent/meson.vim b/indent/meson.vim
index 738d86fa..a546f944 100644
--- a/indent/meson.vim
+++ b/indent/meson.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'meson') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 " Vim indent file
 " Language:		Meson
 " Maintainer:		Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
@@ -181,3 +178,4 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:sw=2
+endif
diff --git a/indent/moon.vim b/indent/moon.vim
index b758b0e8..7fe985d3 100644
--- a/indent/moon.vim
+++ b/indent/moon.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'moonscript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
 " Based On:    CoffeeScript by Mick Koch <kchmck@gmail.com>
@@ -325,3 +322,4 @@ function! GetMoonIndent(curlinenum)
 
   return indent
 endfunction
+endif
diff --git a/indent/nginx.vim b/indent/nginx.vim
index df8ccaef..0aefe740 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nginx') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 if exists("b:did_indent")
     finish
 endif
@@ -13,3 +10,4 @@ setlocal indentexpr=
 setlocal cindent
 " Just make sure that the comments are not reset as defs would be.
 setlocal cinkeys-=0#
+endif
diff --git a/indent/nim.vim b/indent/nim.vim
index 94250b70..b61ee8b3 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nim') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
@@ -144,3 +141,4 @@ endfunction
 
 " vim:sw=2
 
+endif
diff --git a/indent/nix.vim b/indent/nix.vim
index 54abd430..e70a06a5 100644
--- a/indent/nix.vim
+++ b/indent/nix.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 " Vim indent file
 " Language:    Nix
 " Maintainer:  Daiderd Jordan <daiderd@gmail.com>
@@ -105,3 +102,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index 2da3e15b..9c10ac6f 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim indent file
 " Language:     OCaml
 " Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
@@ -275,3 +272,4 @@ function! GetOCamlIndent()
 endfunction
 
 " vim:sw=2
+endif
diff --git a/indent/omake.vim b/indent/omake.vim
index cac4521a..5d610650 100644
--- a/indent/omake.vim
+++ b/indent/omake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim indent file
 " Language:         OMakefile
 
@@ -116,3 +113,4 @@ function GetMakeIndent()
     endif
   endif
 endfunction
+endif
diff --git a/indent/opencl.vim b/indent/opencl.vim
index 6bd47ddc..c97c54e6 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'opencl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
@@ -12,3 +9,4 @@ if version > 600
 endif
 
 let b:did_indent = 1
+endif
diff --git a/indent/perl.vim b/indent/perl.vim
index 9733f52a..46895815 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 " Vim indent file
 " Language:      Perl 5
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -182,3 +179,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=8:sts=4:sw=4:expandtab:ft=vim
+endif
diff --git a/indent/pgsql.vim b/indent/pgsql.vim
index 9c99b0c5..0f60bf1a 100644
--- a/indent/pgsql.vim
+++ b/indent/pgsql.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pgsql') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
 " Vim indent file
 " Language:    SQL
 " Author:  David Fishburn <dfishburn dot vim at gmail dot com>
@@ -391,3 +388,4 @@ endfunction
 let &cpo= s:keepcpo
 unlet s:keepcpo
 " vim: ts=4 fdm=marker sw=4
+endif
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index 919a0c86..7f33b156 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'plantuml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 scriptencoding utf-8
 " Vim indent file
 " Language:     PlantUML
@@ -87,3 +84,4 @@ function! s:getIncIndent() abort
         \ '^\s*skinparam\>.*{\s*$\|' .
         \ s:typeKeywordIncPattern()
 endfunction
+endif
diff --git a/indent/pony.vim b/indent/pony.vim
index 5db42cae..67ce483b 100644
--- a/indent/pony.vim
+++ b/indent/pony.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 " Vim indent file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -39,3 +36,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:did_indent = 1
+endif
diff --git a/indent/proto.vim b/indent/proto.vim
index 4520d170..d94a4f18 100644
--- a/indent/proto.vim
+++ b/indent/proto.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'protobuf') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
 " Vim indent file
 " Language:	Protobuf
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
@@ -19,3 +16,4 @@ setlocal expandtab
 setlocal shiftwidth=2
 
 let b:undo_indent = "setl cin<"
+endif
diff --git a/indent/ps1.vim b/indent/ps1.vim
index e0b01e0d..96ca8b2c 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 " Vim indent file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -22,3 +19,4 @@ inoremap <buffer> # X#
 
 let b:undo_indent = "setl si<"
 
+endif
diff --git a/indent/pug.vim b/indent/pug.vim
index c4f71cde..cfb363cc 100644
--- a/indent/pug.vim
+++ b/indent/pug.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pug') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 " Vim indent file
 " Language: Pug
 " Maintainer: Joshua Borton
@@ -72,3 +69,4 @@ function! GetPugIndent()
 endfunction
 
 " vim:set sw=2:
+endif
diff --git a/indent/puppet.vim b/indent/puppet.vim
index 977e8606..a3a494a0 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 " Vim indent file
 " Language: Puppet
 " Maintainer:   Todd Zullinger <tmz@pobox.com>
@@ -138,3 +135,4 @@ function! GetPuppetIndent(...)
 
     return ind
 endfunction
+endif
diff --git a/indent/purescript.vim b/indent/purescript.vim
index 0d152b57..780a06a1 100644
--- a/indent/purescript.vim
+++ b/indent/purescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'purescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 " indentation for purescript
 "
 " Based on idris indentation
@@ -278,3 +275,4 @@ function! GetPurescriptIndent()
 
   return match(prevline, '\S')
 endfunction
+endif
diff --git a/indent/python.vim b/indent/python.vim
index 2b8fef1e..2bf211d8 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-indent') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-indent') == -1
 " PEP8 compatible Python indent file
 " Language:         Python
 " Maintainer:       Daniel Hahler <https://daniel.hahler.de/>
@@ -456,3 +453,4 @@ function! GetPythonPEPIndent(lnum)
 
     return s:indent_like_previous_line(a:lnum)
 endfunction
+endif
diff --git a/indent/qml.vim b/indent/qml.vim
index 7e1c2019..9187f60f 100644
--- a/indent/qml.vim
+++ b/indent/qml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'qml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 " Vim indent file
 " Language:     QML
 " Author:       Robert Kieffer
@@ -61,3 +58,4 @@ function! GetJsIndent()
 
   return ind
 endfunction
+endif
diff --git a/indent/racket.vim b/indent/racket.vim
index 2bbbb6c3..f6b1e06d 100644
--- a/indent/racket.vim
+++ b/indent/racket.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
 " URL:          http://github.com/wlangstroth/vim-racket
@@ -14,3 +11,4 @@ let b:did_indent = 1
 setlocal ai nosi
 
 let b:undo_indent = "setl ai< si<"
+endif
diff --git a/indent/reason.vim b/indent/reason.vim
index 4901a4f5..0e8c3b74 100644
--- a/indent/reason.vim
+++ b/indent/reason.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'reason') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 " Vim indent file
 " Language:         Reason (adapted from Rust)
 " Author:           Chris Morgan <me@chrismorgan.info> (Modifications by Jordan W)
@@ -219,3 +216,4 @@ function GetReasonIndent(lnum)
 	" Fall back on cindent, which does it mostly right
 	return cindent(a:lnum)
 endfunction
+endif
diff --git a/indent/ruby.vim b/indent/ruby.vim
index 56c1aa12..dad86a8c 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim indent file
 " Language:		Ruby
 " Maintainer:		Andrew Radev <andrey.radev@gmail.com>
@@ -954,3 +951,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
+endif
diff --git a/indent/rust.vim b/indent/rust.vim
index 68178070..a744008f 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Vim indent file
 " Language:         Rust
 " Author:           Chris Morgan <me@chrismorgan.info>
@@ -281,3 +278,4 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/indent/scala.vim b/indent/scala.vim
index 2fcb3378..d70b35df 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 " Vim indent file
 " Language         : Scala (http://scala-lang.org/)
 " Original Author  : Stefan Matthias Aust
@@ -608,3 +605,4 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 et:
 " vim600:fdm=marker fdl=1 fdc=0:
+endif
diff --git a/indent/scss.vim b/indent/scss.vim
index f602f358..efbd1812 100644
--- a/indent/scss.vim
+++ b/indent/scss.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 " Vim indent file
 " Language    : SCSS (Sassy CSS)
 " Maintainer  : Daniel Hofstetter (daniel.hofstetter@42dh.com)
@@ -91,3 +88,4 @@ unlet s:keepcpo
 
 " vim:set et ts=2 sw=2:
 
+endif
diff --git a/indent/slim.vim b/indent/slim.vim
index 75220e2b..43dfd5be 100644
--- a/indent/slim.vim
+++ b/indent/slim.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slim') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 " Vim indent file
 " Language:	Slim
 
@@ -77,3 +74,4 @@ function! GetSlimIndent()
 endfunction
 
 " vim:set sw=2:
+endif
diff --git a/indent/slime.vim b/indent/slime.vim
index e986847c..50cd6d24 100644
--- a/indent/slime.vim
+++ b/indent/slime.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slime') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slime') == -1
 " Vim indent file
 " Language:	Slime
 
@@ -77,3 +74,4 @@ function! GetSlimeIndent()
 endfunction
 
 " vim:set sw=2:
+endif
diff --git a/indent/solidity.vim b/indent/solidity.vim
index 32917b43..682a0e48 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'solidity') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 " Vim indent file
 " Language: Solidity
 " Acknowledgement: Based off of vim-javascript
@@ -441,3 +438,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/stylus.vim b/indent/stylus.vim
index 16fb86e6..94f59678 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'stylus') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 " Vim indent file
 " Language: Stylus
 " Maintainer: Marc Harter
@@ -131,3 +128,4 @@ function! GetStylusIndent()
 endfunction
 
 " vim:set sw=2;
+endif
diff --git a/indent/svelte.vim b/indent/svelte.vim
index ef0569ed..d4939adb 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'svelte') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1
 " Vim indent file
 " Language:   Svelte 3 (HTML/JavaScript)
 " Author:     Evan Lecklider <evan@lecklider.com>
@@ -146,3 +143,4 @@ function! GetSvelteIndent()
 
   return indent
 endfunction
+endif
diff --git a/indent/svg.vim b/indent/svg.vim
index 8e22f3bf..90d1dfaf 100644
--- a/indent/svg.vim
+++ b/indent/svg.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'svg-indent') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svg-indent') == -1
 " Vim indent file
 "
 " Language: svg
@@ -107,3 +104,4 @@ endfun
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
+endif
diff --git a/indent/swift.vim b/indent/swift.vim
index f4448806..247197cb 100644
--- a/indent/swift.vim
+++ b/indent/swift.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'swift') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 " File: swift.vim
 " Author: Keith Smiley
 " Description: The indent file for Swift
@@ -296,3 +293,4 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/terraform.vim b/indent/terraform.vim
index 74b7808a..81fb938c 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 " Only load this file if no other indent file was loaded
 if exists('b:did_indent')
   finish
@@ -56,3 +53,4 @@ endfunction
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/indent/tex.vim b/indent/tex.vim
index 31abcd57..c498c0c4 100644
--- a/indent/tex.vim
+++ b/indent/tex.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX indent file (part of LaTeX Box)
 " Maintainer: David Munger (mungerd@gmail.com)
 
@@ -138,3 +135,4 @@ if v:version > 703 || (v:version == 703 && has('patch598'))
 endif
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/indent/tsx.vim b/indent/tsx.vim
index 906ee222..d6ab43a2 100644
--- a/indent/tsx.vim
+++ b/indent/tsx.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " Save the current JavaScript indentexpr.
 let b:tsx_ts_indentexpr = &indentexpr
 
@@ -112,3 +109,4 @@ fu! GetTsxIndent()
 
   return ind
 endfu
+endif
diff --git a/indent/twig.vim b/indent/twig.vim
index 69d60524..240181be 100644
--- a/indent/twig.vim
+++ b/indent/twig.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'twig') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 if exists("b:ran_once")
 	finish
 endif
@@ -78,3 +75,4 @@ fun! s:BuildStructures()
 endfun
 
 call s:BuildStructures()
+endif
diff --git a/indent/typescript.vim b/indent/typescript.vim
index deb4f18c..ce94f32a 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 " Vim indent file
 " Language: TypeScript
 " Acknowledgement: Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org
@@ -503,3 +500,4 @@ function! Fixedgq(lnum, count)
 
     return 0
 endfunction
+endif
diff --git a/indent/vala.vim b/indent/vala.vim
index fa3aac3d..288885b5 100644
--- a/indent/vala.vim
+++ b/indent/vala.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
 " Vim indent file
 " Language:         Vala
 " Author:           Adrià Arrufat <adria.arrufat@protonmail.ch>
@@ -85,3 +82,4 @@ function GetValaIndent(lnum)
 	" Fall back on cindent, which does it mostly right
 	return cindent(a:lnum)
 endfunction
+endif
diff --git a/indent/velocity.vim b/indent/velocity.vim
index 6ac23863..2f6fe153 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vm') == -1
 if exists("b:did_indent")
     finish
 endif
 
 runtime! indent/html.vim
+endif
diff --git a/indent/vue.vim b/indent/vue.vim
index 2acc65ac..a07f28ab 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vue') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 " Vim indent file
 " Language: Vue.js
 " Maintainer: Eduardo San Martin Morote
@@ -66,3 +63,4 @@ function! GetVueIndent()
 
   return indent
 endfunction
+endif