7 files changed, 14 insertions, 28 deletions
diff --git a/ftplugin/latex-box/common.vim b/ftplugin/latex-box/common.vim
index 1eccacd4..938d97b2 100644
--- a/ftplugin/latex-box/common.vim
+++ b/ftplugin/latex-box/common.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box common functions
 
 " Error Format {{{
@@ -415,3 +412,4 @@ endfunction
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/complete.vim b/ftplugin/latex-box/complete.vim
index 365ea14f..74f98696 100644
--- a/ftplugin/latex-box/complete.vim
+++ b/ftplugin/latex-box/complete.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box completion
 
 setlocal omnifunc=LatexBox_Complete
@@ -934,3 +931,4 @@ command! LatexLabels call <SID>PromptLabelList()
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/findmain.vim b/ftplugin/latex-box/findmain.vim
index a52d745e..a06358b5 100644
--- a/ftplugin/latex-box/findmain.vim
+++ b/ftplugin/latex-box/findmain.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LatexBox_GetMainFileName: gets the name of the main file being compiled. {{{
 " Description:  returns the full path name of the main file.
 "               This function checks for the existence of a .latexmain file
@@ -64,3 +61,4 @@ function! LatexBox_GetMainFileName(...)
 	"       certain platforms.
 	return lheadfile
 endfunction
+endif
diff --git a/ftplugin/latex-box/folding.vim b/ftplugin/latex-box/folding.vim
index 6311ebf2..1dac48d5 100644
--- a/ftplugin/latex-box/folding.vim
+++ b/ftplugin/latex-box/folding.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " Folding support for LaTeX
 
 "
@@ -380,3 +377,4 @@ endfunction
 
 " {{{1 Footer
 " vim:fdm=marker:ff=unix:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/latexmk.vim b/ftplugin/latex-box/latexmk.vim
index bee760a5..c1b917b7 100644
--- a/ftplugin/latex-box/latexmk.vim
+++ b/ftplugin/latex-box/latexmk.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box latexmk functions
 
 " Options and variables {{{
@@ -556,3 +553,4 @@ endif
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/mappings.vim b/ftplugin/latex-box/mappings.vim
index ccfb5d8d..7d2e0633 100644
--- a/ftplugin/latex-box/mappings.vim
+++ b/ftplugin/latex-box/mappings.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box mappings
 
 if exists("g:LatexBox_no_mappings")
@@ -108,3 +105,4 @@ vnoremap <buffer> <silent> [[ :<c-u>call <SID>LatexBoxNextSection(0,1,1)<CR>
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif
diff --git a/ftplugin/latex-box/motion.vim b/ftplugin/latex-box/motion.vim
index b9614d72..9caa0ed5 100644
--- a/ftplugin/latex-box/motion.vim
+++ b/ftplugin/latex-box/motion.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
 " LaTeX Box motion functions
 
 " Motion options {{{
@@ -546,3 +543,4 @@ command! LatexTOCToggle call LatexBox_TOC(1)
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+endif