8 files changed, 32 insertions, 32 deletions
diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 17bca8f5..3c66372a 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,7 +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
+
 setlocal comments=s1fl:{-,mb:-,ex:-},:--
 setlocal iskeyword+=-,.,*
 setlocal commentstring=--\ %s
-
-endif
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index 9c8f5843..2060d276 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,9 +1,9 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cjsx') != -1
+  finish
+endif
+
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
   let b:match_words = '(:),\[:\],{:},<:>,' .
     \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
 endif
-
-endif
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 9fa505f7..2d3d6b33 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,6 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
+  finish
+endif
+
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--
 setlocal iskeyword+='
-
-endif
diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
index e9214981..9efbb8d9 100644
--- a/after/ftplugin/javascript.vim
+++ b/after/ftplugin/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 filetype plugin file
 " Language:     JavaScript
 " Maintainer:   vim-javascript community
@@ -12,5 +14,3 @@ if exists('b:undo_ftplugin')
 else
   let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
 endif
-
-endif
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index 380d476b..12173822 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1
+  finish
+endif
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim ftplugin file
 "
@@ -19,5 +21,3 @@ if exists("loaded_matchit")
 endif
 
 setlocal suffixesadd+=.jsx
-
-endif
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 574fee25..1265038b 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
+  finish
+endif
+
 if !exists('g:puppet_align_hashes')
     let g:puppet_align_hashes = 1
 endif
@@ -16,5 +18,3 @@ if g:puppet_align_hashes && exists(':Tabularize')
         call search(repeat('\([^=]\|=[^>]\)*=>',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
     endfunction
 endif
-
-endif
diff --git a/after/ftplugin/terraform.vim b/after/ftplugin/terraform.vim
index 48ae0f20..610fd900 100644
--- a/after/ftplugin/terraform.vim
+++ b/after/ftplugin/terraform.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
+  finish
+endif
+
 if !exists('g:terraform_align')
   let g:terraform_align = 0
 endif
@@ -81,5 +83,3 @@ if exists('g:terraform_commentstring')
 else
     setlocal commentstring=#%s
 endif
-
-endif
diff --git a/after/ftplugin/yaml.vim b/after/ftplugin/yaml.vim
index 047641dc..a6b6d194 100644
--- a/after/ftplugin/yaml.vim
+++ b/after/ftplugin/yaml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yaml') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Yaml
 " Author: Henrique Barcelos
@@ -7,5 +9,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 " URL: https://github.com/hjpbarcelos
 setlocal autoindent sw=2 ts=2 expandtab
 " vim:set sw=2:
-
-endif