Allow for disabling individual languages, closes #66

44 files changed, 176 insertions, 1 deletions

diff --git a/indent/arduino.vim b/indent/arduino.vim
index b10e6e2f..21ba1964 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
+  
 " Vim indent file
 " Language:	Arduino
 " Maintainer:	Kevin Sjöberg <kev.sjoberg@gmail.com>
@@ -13,3 +15,5 @@ let b:did_indent = 1
 setlocal cindent
 
 let b:undo_indent = "setl cin<"
+
+endif
diff --git a/indent/blade.vim b/indent/blade.vim
index 7515a239..8327f451 100644
--- a/indent/blade.vim
+++ b/indent/blade.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
+  
 " Language:     Blade
 " Author:       Barry Deeney <sitemaster16@gmail.com>
 " Version:      0.1
@@ -60,3 +62,5 @@ endfunc
 
 " Make sure we store that flag!
 let b:did_indent = 1
+
+endif
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 3f0fd823..cb8c050b 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
+  
 " Vim indent file
 " Language:	Clojure
 " Author:	Meikel Brandmeyer <mb@kotka.de>
@@ -378,3 +380,5 @@ let &cpo = s:save_cpo
 unlet! s:save_cpo
 
 " vim:sts=8:sw=8:ts=8:noet
+
+endif
diff --git a/indent/coffee.vim b/indent/coffee.vim
index 4f4570a8..fc9b58f7 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -426,3 +428,5 @@ function! GetCoffeeIndent(curlnum)
   " No special rules applied, so use the default policy.
   exec 'return' s:GetDefaultPolicy(a:curlnum)
 endfunction
+
+endif
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index 965c7786..5e646a51 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
+  
 " Vim indent file
 " Language:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -72,3 +74,5 @@ function! GetCucumberIndent()
 endfunction
 
 " vim:set sts=2 sw=2:
+
+endif
diff --git a/indent/eelixir.vim b/indent/eelixir.vim
index 7b17c104..c5e2491e 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+  
 " Vim indent file
 " Language: Embedded Elixir
 " URL:      https://github.com/elixir-lang/vim-elixir
@@ -70,3 +72,5 @@ function! GetEelixirIndent(...)
   endif
   return ind
 endfunction
+
+endif
diff --git a/indent/elixir.vim b/indent/elixir.vim
index 636097b7..863104d3 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+  
 " Vim indent file
 " Language: Elixir
 " Maintainer: Carlos Galdino <carloshsgaldino@gmail.com>
@@ -117,3 +119,5 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
+endif
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index 8bfa049c..ee2ccc76 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
+  
 " Language:    ember-script
 " Maintainer:  heartsentwined <heartsentwined@cogito-lab.com>
 " URL:         http://github.com/heartsentwined/vim-ember-script
@@ -12,3 +14,5 @@ endif
 runtime! indent/coffee.vim
 unlet! b:did_indent
 let b:did_indent = 1
+
+endif
diff --git a/indent/emblem.vim b/indent/emblem.vim
index 21c8aea5..8b8bc068 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.vim
@@ -1,6 +1,10 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
+  
 " Language:    emblem
 " Maintainer:  heartsentwined <heartsentwined@cogito-lab.com>
 " URL:         http://github.com/heartsentwined/vim-emblem
 " Version:     1.2.0
 " Last Change: 2013 Apr 22
 " License:     GPL-3.0
+
+endif
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 6bcec851..b1186ca8 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
+  
 " Vim indent file
 " Language:     Erlang (http://www.erlang.org)
 " Author:       Csaba Hoch <csaba.hoch@gmail.com>
@@ -1479,3 +1481,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 et fdm=marker
+
+endif
diff --git a/indent/eruby.vim b/indent/eruby.vim
index 5028fe06..07cff818 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+  
 " Vim indent file
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -100,3 +102,5 @@ function! GetErubyIndent(...)
 endfunction
 
 " vim:set sw=2 sts=2 ts=8 noet:
+
+endif
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index 8eece5d3..b6453d21 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
+  
 " Vim indent file
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -35,3 +37,5 @@ function! GetGitconfigIndent()
     return -1
   endif
 endfunction
+
+endif
diff --git a/indent/go.vim b/indent/go.vim
index a3fa2b7a..102d3495 100644
--- a/indent/go.vim
+++ b/indent/go.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
+  
 " Copyright 2011 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
@@ -76,3 +78,5 @@ function! GoIndent(lnum)
 endfunction
 
 " vim:ts=4:sw=4:et
+
+endif
diff --git a/indent/gohtmltmpl.vim b/indent/gohtmltmpl.vim
index 50399f2b..7275383e 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.vim
@@ -1,5 +1,9 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
+  
 if exists("b:did_indent")
   finish
 endif
 
 runtime! indent/html.vim
+
+endif
diff --git a/indent/haml.vim b/indent/haml.vim
index 710aefc0..e6e04181 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
+  
 " Vim indent file
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -71,3 +73,5 @@ function! GetHamlIndent()
 endfunction
 
 " vim:set sw=2:
+
+endif
diff --git a/indent/haskell.vim b/indent/haskell.vim
index 1d500250..6a16e735 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
+  
 " Vim indent file
 " Language: Haskell
 " Maintainer: Tristan Ravitch
@@ -294,3 +296,5 @@ function! s:BackwardPatternSearch(lnum, pat)
   endwhile
 endfunction
 
+
+endif
diff --git a/indent/html.vim b/indent/html.vim
index 94baa871..a09df409 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+  
 " Description:      HTML5 and inline SVG indenter
 " Changed By: HT de Beer <H.T.de.Beer@gmail.com>
 " Last Change: 20121013
@@ -385,3 +387,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " [-- EOF <runtime>/indent/html.vim --]
+
+endif
diff --git a/indent/jade.vim b/indent/jade.vim
index 8cfa656d..da29e0cf 100644
--- a/indent/jade.vim
+++ b/indent/jade.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jade') == -1
+  
 " Vim indent file
 " Language: Jade
 " Maintainer: Joshua Borton
@@ -68,3 +70,5 @@ function! GetJadeIndent()
 endfunction
 
 " vim:set sw=2:
+
+endif
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0a2f839e..dedc41fa 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
 " Vim indent file
 " Language: Javascript
 " Acknowledgement: Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org
@@ -499,3 +501,5 @@ function! Fixedgq(lnum, count)
 
     return 0
 endfunction
+
+endif
diff --git a/indent/json.vim b/indent/json.vim
index 9e563ad4..912bbfcf 100644
--- a/indent/json.vim
+++ b/indent/json.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
+  
 " Vim indent file
 " Language:		JSON
 " Mantainer:		Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
@@ -167,3 +169,5 @@ unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
+
+endif
diff --git a/indent/jst.vim b/indent/jst.vim
index c9162741..773500dc 100644
--- a/indent/jst.vim
+++ b/indent/jst.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
+  
 if exists("b:did_indent")
   finish
 endif
@@ -73,3 +75,5 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
+
+endif
diff --git a/indent/julia.vim b/indent/julia.vim
index 19314207..7fafe89c 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+  
 " Vim indent file
 " Language:	Julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
@@ -196,3 +198,5 @@ function GetJuliaIndent()
   unlet s:save_ignorecase
   return ind
 endfunction
+
+endif
diff --git a/indent/less.vim b/indent/less.vim
index 556c2d08..700a19fb 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
+  
 " Vim indent file
 " Language:            LessCSS
 " Maintainer:        Leonard Ehrenfried <leonard.ehrenfried@web.de>
@@ -7,4 +9,5 @@ if exists("b:did_indent")
   finish
 endif
 
-runtime! indent/css.vim
\ No newline at end of file
+runtime! indent/css.vim
+endif
diff --git a/indent/liquid.vim b/indent/liquid.vim
index 2f729f00..2025dacd 100644
--- a/indent/liquid.vim
+++ b/indent/liquid.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
+  
 " Vim indent file
 " Language:     Liquid
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
@@ -60,3 +62,5 @@ function! GetLiquidIndent(...)
   let ind -= &sw * s:count(cline,'{%\s*end\w*$')
   return ind
 endfunction
+
+endif
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index a84c992e..dac76ab8 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
+  
 " Vim indent file
 " Language:     OCaml
 " Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
@@ -265,3 +267,5 @@ function! GetOCamlIndent()
 endfunction
 
 " vim:sw=2
+
+endif
diff --git a/indent/opencl.vim b/indent/opencl.vim
index 2401ad30..53df06d0 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
+  
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
@@ -8,3 +10,5 @@ if version > 600
 endif
 
 let b:did_indent = 1
+
+endif
diff --git a/indent/perl.vim b/indent/perl.vim
index 7d21d219..42cc1d01 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
+  
 " Vim indent file
 " Language:      Perl 5
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -178,3 +180,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=8:sts=4:sw=4:expandtab:ft=vim
+
+endif
diff --git a/indent/perl6.vim b/indent/perl6.vim
index 564ca81b..78c6011d 100644
--- a/indent/perl6.vim
+++ b/indent/perl6.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
+  
 " Vim indent file
 " Language:      Perl 6
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -125,3 +127,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=8:sts=4:sw=4:expandtab:ft=vim
+
+endif
diff --git a/indent/ps1.vim b/indent/ps1.vim
index 8198a504..6de24590 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
+  
 " Vim indent file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -18,3 +20,5 @@ inoremap # X#
 
 let b:undo_indent = "setl si<"
 
+
+endif
diff --git a/indent/puppet.vim b/indent/puppet.vim
index cf49de88..e9b08447 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
+  
 " Vim indent file
 " Language: Puppet
 " Maintainer:   Todd Zullinger <tmz@pobox.com>
@@ -92,3 +94,5 @@ function! GetPuppetIndent()
 
     return ind
 endfunction
+
+endif
diff --git a/indent/python.vim b/indent/python.vim
index 24ffd88c..48b34469 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python') == -1
+  
 " PEP8 compatible Python indent file
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -211,3 +213,5 @@ function! GetPythonPEPIndent(lnum)
   " In all other cases, line up with the start of the previous statement.
   return indent(sslnum)
 endfunction
+
+endif
diff --git a/indent/ruby.vim b/indent/ruby.vim
index f0dde6fa..46615343 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+  
 " Vim indent file
 " Language:		Ruby
 " Maintainer:		Nikolai Weibull <now at bitwi.se>
@@ -655,3 +657,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
+
+endif
diff --git a/indent/rust.vim b/indent/rust.vim
index 300d7dac..3033f063 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+  
 " Vim indent file
 " Language:         Rust
 " Author:           Chris Morgan <me@chrismorgan.info>
@@ -194,3 +196,5 @@ function GetRustIndent(lnum)
 	" Fall back on cindent, which does it mostly right
 	return cindent(a:lnum)
 endfunction
+
+endif
diff --git a/indent/sass.vim b/indent/sass.vim
index 1da83193..04a2c750 100644
--- a/indent/sass.vim
+++ b/indent/sass.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
+  
 " Vim indent file
 " Language:	Sass
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -38,3 +40,5 @@ function! GetSassIndent()
 endfunction
 
 " vim:set sw=2:
+
+endif
diff --git a/indent/scala.vim b/indent/scala.vim
index 4930becd..6f5d1da9 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
+  
 " Vim indent file
 " Language         : Scala (http://scala-lang.org/)
 " Original Author  : Stefan Matthias Aust
@@ -596,3 +598,5 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 et:
 " vim600:fdm=marker fdl=1 fdc=0:
+
+endif
diff --git a/indent/scss.vim b/indent/scss.vim
index 82bba492..68ebbe53 100644
--- a/indent/scss.vim
+++ b/indent/scss.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
+  
 " Vim indent file
 " Language:	SCSS
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -10,3 +12,5 @@ endif
 runtime! indent/css.vim
 
 " vim:set sw=2:
+
+endif
diff --git a/indent/slim.vim b/indent/slim.vim
index 5b843bfb..adf4274f 100644
--- a/indent/slim.vim
+++ b/indent/slim.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
+  
 " Vim indent file
 " Language:	Slim
 
@@ -73,3 +75,5 @@ function! GetSlimIndent()
 endfunction
 
 " vim:set sw=2:
+
+endif
diff --git a/indent/solidity.vim b/indent/solidity.vim
index 29b60b5a..23c55061 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
+  
 " Vim indent file
 " Language: Solidity
 " Acknowledgement: Based off of vim-javascript
@@ -437,3 +439,5 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
+endif
diff --git a/indent/stylus.vim b/indent/stylus.vim
index 8707e619..eb958f04 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
+  
 " Vim indent file
 " Language: Stylus
 " Maintainer: Marc Harter
@@ -127,3 +129,5 @@ function! GetStylusIndent()
 endfunction
 
 " vim:set sw=2;
+
+endif
diff --git a/indent/swift.vim b/indent/swift.vim
index 8f0de62c..472b3cf7 100644
--- a/indent/swift.vim
+++ b/indent/swift.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
+  
 " Language:    Swift<https://developer.apple.com/swift/>
 " Maintainer:  toyama satoshi <toyamarinyon@gmail.com>
 " URL:         http://github.com/toyamarinyon/vim-swift
@@ -13,3 +15,5 @@ let b:did_indent = 1
 setlocal cindent
 
 let b:undo_indent = "setl cin<"
+
+endif
diff --git a/indent/tex.vim b/indent/tex.vim
index 3abc44ba..14af7b28 100644
--- a/indent/tex.vim
+++ b/indent/tex.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
+  
 " LaTeX indent file (part of LaTeX Box)
 " Maintainer: David Munger (mungerd@gmail.com)
 
@@ -134,3 +136,5 @@ if v:version > 703 || (v:version == 703 && has('patch598'))
 endif
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+
+endif
diff --git a/indent/typescript.vim b/indent/typescript.vim
index 78d04c5c..73bce658 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
+  
 " Vim indent file, taken from indent/java.vim
 " Language:	    Typescript
 " Maintainer:	None!  Wanna improve this?
@@ -87,3 +89,5 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim: et
+
+endif
diff --git a/indent/vala.vim b/indent/vala.vim
index da54d6bb..42babfb9 100644
--- a/indent/vala.vim
+++ b/indent/vala.vim
@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
+  
 " Copyright (c) 2012 Takezoe Tomoaki <tkztmk@outlook.com>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -30,3 +32,5 @@ let b:did_indent = 1
 setl cin
 let b:undo_indent = "setl cin<"
 
+
+endif
diff --git a/indent/velocity.vim b/indent/velocity.vim
index f30c4af8..297fffff 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,5 +1,9 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vm') == -1
+  
 if exists("b:did_indent")
     finish
 endif
 
 runtime! indent/html.vim
+
+endif