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

---
 autoload/elixir/indent.vim | 6 ++----
 autoload/elixir/util.vim   | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'autoload/elixir')

diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index 74d7344c..2924f0e6 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.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("g:elixir_indent_max_lookbehind")
   let g:elixir_indent_max_lookbehind = 30
 endif
@@ -363,3 +360,4 @@ function! elixir#indent#handle_inside_generic_block(context)
     return -1
   endif
 endfunction
+endif
diff --git a/autoload/elixir/util.vim b/autoload/elixir/util.vim
index f02e1b87..d6b6541a 100644
--- a/autoload/elixir/util.vim
+++ b/autoload/elixir/util.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
 function! elixir#util#get_filename(word) abort
   let word = a:word
 
@@ -26,3 +23,4 @@ function! elixir#util#get_filename(word) abort
 
   return word
 endfunction
+endif
-- 
cgit v1.2.3