3 files changed, 12 insertions, 12 deletions
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index 026e20cd..817b6f99 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:             Scala
 " Maintainer:           Derek Wyatt
@@ -176,5 +178,3 @@ noremap <script> <buffer> <silent> ]] :call <SID>NextSection(0)<cr>
 noremap <script> <buffer> <silent> [[ :call <SID>NextSection(1)<cr>
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim
index bb20242d..86995e0d 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 
 XPTemplate priority=lang
 
@@ -29,5 +31,3 @@ trait `derived^`trait^Component extends `trait^Component {
 		`body2^
 	}
 }
-
-endif
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index e6ab70e5..e53b5591 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
 "
@@ -31,5 +33,3 @@ let g:tagbar_type_scala = {
 if get(g:, 'scala_use_builtin_tagbar_defs', 1)
   let g:tagbar_type_scala.deffile = expand('<sfile>:p:h:h:h') . '/ctags/scala.ctags'
 endif
-
-endif