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/fish.vim | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'ftplugin/fish.vim')

diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index 3784b4c4..6097e2ab 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/fish.vim
@@ -1,7 +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 comments=:#
 setlocal commentstring=#%s
 setlocal define=\\v^\\s*function>
@@ -41,3 +38,4 @@ let b:match_words =
 let b:endwise_addition = 'end'
 let b:endwise_words = 'begin,function,if,switch,while,for'
 let b:endwise_syngroups = 'fishKeyword,fishConditional,fishRepeat'
+endif
-- 
cgit v1.2.3