3 files changed, 6 insertions, 12 deletions
diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim
index 54a57599..c45bc90f 100644
--- a/autoload/puppet/align.vim
+++ b/autoload/puppet/align.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 function! puppet#align#IndentLevel(lnum)
     return indent(a:lnum) / &shiftwidth
 endfunction
@@ -70,3 +67,4 @@ function! puppet#align#AlignHashrockets(...) abort
         endif
     endfor
 endfunction
+endif
diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim
index 5547f42e..469b1213 100644
--- a/autoload/puppet/ctags.vim
+++ b/autoload/puppet/ctags.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 if !exists('s:ctags_type')
   let s:ctags_type = 0
@@ -38,3 +35,4 @@ function! puppet#ctags#Type()
   return s:ctags_type
 endfunction
 
+endif
diff --git a/autoload/puppet/format.vim b/autoload/puppet/format.vim
index f60bd782..c608f228 100644
--- a/autoload/puppet/format.vim
+++ b/autoload/puppet/format.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 "
 " Simple format using puppet's l:indents and align hashrockets function
 function! puppet#format#Format() abort
@@ -59,3 +56,4 @@ function! puppet#format#Fallback(start_lnum, end_lnum) abort
 
 endfunction
 
+endif