From 48e07bc5014fecfdff24f75124a65634c216c9e2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 6 Sep 2019 15:54:31 +0200
Subject: Improve guard to support concatenated files

---
 ftplugin/scala.vim | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'ftplugin/scala.vim')

diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index d843daa9..199aed94 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/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 filetype plugin
 " Language:             Scala
 " Maintainer:           Derek Wyatt
@@ -178,3 +175,4 @@ 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
-- 
cgit v1.2.3