Add groovy syntax, closes #74

.gitattributes

@@ -1,6 +1,5 @@
 .gitignore export-ignore
 .gitattributes export-ignore
-build export-ignore
 README.md export-ignore
 /spec export-ignore
 Gemfile export-ignore

README.md

@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
-- It **won't affect your startup time**, as scripts are loaded only on demand\*. 
+- It **won't affect your startup time**, as scripts are loaded only on demand\*.
 - It **installs 50+ times faster** than 50+ packages it consist of.
 - Solid syntax and indentation support. Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -26,29 +26,36 @@ Optionally download one of the [releases](https://github.com/sheerun/vim-polyglo
 ## Language packs
 
 - [arduino](https://github.com/sudar/vim-arduino-syntax) (syntax, indent, ftdetect)
+- [blade](https://github.com/xsbeats/vim-blade) (syntax, indent, ftdetect)
 - [c++11](https://github.com/octol/vim-cpp-enhanced-highlight) (syntax)
 - [c/c++](https://github.com/vim-jp/cpp-vim) (syntax)
-- [c-extensions](https://github.com/kergoth/aftersyntaxc.vim) (syntax)
 - [clojure](https://github.com/guns/vim-clojure-static) (syntax, indent, autoload, ftplugin, ftdetect)
 - [coffee-script](https://github.com/kchmck/vim-coffee-script) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
-- [csv](https://github.com/chrisbra/csv.vim) (syntax, ftplugin, ftdetect)
+- [cjsx](https://github.com/mtscout6/vim-cjsx) (ftdetect, syntax, ftplugin)
+- [css](https://github.com/JulesWang/css.vim) (syntax)
 - [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin, ftdetect)
 - [dockerfile](https://github.com/honza/dockerfile.vim) (syntax, ftdetect)
 - [elixir](https://github.com/elixir-lang/vim-elixir) (syntax, indent, compiler, ftplugin, ftdetect)
 - [emberscript](https://github.com/heartsentwined/vim-ember-script) (syntax, indent, ftplugin, ftdetect)
-- [erlang](https://github.com/oscarh/vimerl) (syntax, indent, compiler, autoload, ftplugin)
+- [emblem](https://github.com/heartsentwined/vim-emblem) (syntax, indent, ftplugin, ftdetect)
+- [erlang](https://github.com/hcs42/vim-erlang-runtime) (syntax, indent)
 - [git](https://github.com/tpope/vim-git) (syntax, indent, ftplugin, ftdetect)
-- [go](https://github.com/jnwhiteh/vim-golang) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
+- [glsl](https://github.com/tikhomirov/vim-glsl) (syntax, indent, ftdetect)
+- [go](https://github.com/fatih/vim-go) (syntax, indent, ftdetect)
+- [groovy](https://github.com/vim-scripts/groovy.vim) (syntax)
 - [haml](https://github.com/tpope/vim-haml) (syntax, indent, compiler, ftplugin, ftdetect)
 - [handlebars](https://github.com/mustache/vim-mustache-handlebars) (syntax, ftplugin, ftdetect)
-- [haskell](https://github.com/travitch/hasksyn) (syntax, indent, ftplugin)
+- [haskell](https://github.com/raichoo/haskell-vim) ()
 - [haxe](https://github.com/yaymukund/vim-haxe) (syntax, ftdetect)
 - [html5](https://github.com/othree/html5.vim) (syntax, indent, autoload, ftplugin)
 - [jade](https://github.com/digitaltoad/vim-jade) (syntax, indent, ftplugin, ftdetect)
 - [jasmine](https://github.com/glanotte/vim-jasmine) (syntax, ftdetect)
-- [javascript](https://github.com/pangloss/vim-javascript) (syntax, indent, ftdetect)
+- [javascript](https://github.com/sheerun/yajs.vim) (syntax, indent)
-- [json](https://github.com/leshill/vim-json) (syntax, ftdetect)
+- [julia](https://github.com/dcjones/julia-minimalist-vim) (syntax, indent, ftdetect)
+- [json](https://github.com/sheerun/vim-json) (syntax, indent, ftdetect)
 - [jst](https://github.com/briancollins/vim-jst) (syntax, indent, ftdetect)
+- [jsx](https://github.com/mxw/vim-jsx) (after)
+- [kotlin](https://github.com/udalov/kotlin-vim) (syntax, indent, ftdetect)
 - [latex](https://github.com/LaTeX-Box-Team/LaTeX-Box) (syntax, indent, ftplugin)
 - [less](https://github.com/groenewege/vim-less) (syntax, indent, ftplugin, ftdetect)
 - [liquid](https://github.com/tpope/vim-liquid) (syntax, indent, ftplugin, ftdetect)
@@ -60,27 +67,48 @@ Optionally download one of the [releases](https://github.com/sheerun/vim-polyglo
 - [perl](https://github.com/vim-perl/vim-perl) (syntax, indent, ftplugin, ftdetect)
 - [php](https://github.com/StanAngeloff/php.vim) (syntax)
 - [puppet](https://github.com/rodjek/vim-puppet) (syntax, indent, ftplugin, ftdetect)
+- [powershell](https://github.com/Persistent13/vim-ps1) (syntax, indent, ftplugin, ftdetect)
 - [protobuf](https://github.com/uarun/vim-protobuf) (syntax, ftdetect)
 - [python](https://github.com/mitsuhiko/vim-python-combined) (syntax, indent)
 - [r-lang](https://github.com/vim-scripts/R.vim) (syntax, ftplugin)
+- [ragel](https://github.com/jneen/ragel.vim) (syntax)
 - [rspec](https://github.com/sheerun/rspec.vim) (syntax, ftdetect)
 - [ruby](https://github.com/vim-ruby/vim-ruby) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
-- [rust](https://github.com/wting/rust.vim) (syntax, indent, compiler, ftplugin, ftdetect)
+- [rust](https://github.com/wting/rust.vim) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
 - [sbt](https://github.com/derekwyatt/vim-sbt) (syntax, ftdetect)
-- [scala](https://github.com/derekwyatt/vim-scala) (syntax, indent, ftplugin, ftdetect)
+- [scala](https://github.com/derekwyatt/vim-scala) (syntax, indent, compiler, ftplugin, ftdetect)
 - [slim](https://github.com/slim-template/vim-slim) (syntax, indent, ftdetect)
+- [solidity](https://github.com/ethereum/vim-solidity) (syntax, indent, ftdetect)
 - [stylus](https://github.com/wavded/vim-stylus) (syntax, indent, ftplugin, ftdetect)
 - [systemd](https://github.com/kurayama/systemd-vim-syntax) (syntax, ftdetect)
+- [swift](https://github.com/toyamarinyon/vim-swift) (syntax, indent, ftdetect)
 - [textile](https://github.com/timcharper/textile.vim) (syntax, ftplugin, ftdetect)
-- [tmux](https://github.com/acustodioo/vim-tmux) (syntax, ftdetect)
+- [tmux](https://github.com/tejr/vim-tmux) (syntax, ftdetect)
 - [tomdoc](https://github.com/duwanis/tomdoc.vim) (syntax)
-- [typescript](https://github.com/leafgarland/typescript-vim) (syntax, compiler, ftplugin, ftdetect)
+- [typescript](https://github.com/leafgarland/typescript-vim) (syntax, indent, compiler, ftplugin, ftdetect)
 - [vbnet](https://github.com/vim-scripts/vbnet.vim) (syntax)
-- [toml](https://github.com/cespare/vim-toml) (syntax, ftdetect)
+- [thrift](https://github.com/solarnz/thrift.vim) (syntax, ftdetect)
+- [toml](https://github.com/cespare/vim-toml) (syntax, ftplugin, ftdetect)
 - [twig](https://github.com/beyondwords/vim-twig) (syntax, ftplugin, ftdetect)
 - [xls](https://github.com/vim-scripts/XSLT-syntax) (syntax)
 - [yard](https://github.com/sheerun/vim-yardoc) (syntax)
-- [css-color](https://github.com/ap/vim-css-color) (autoload, syntax)
+- [vala](https://github.com/tkztmk/vim-vala) (syntax, indent, ftdetect)
+- [vm](https://github.com/lepture/vim-velocity) (syntax, indent, ftdetect)
+
+## Disabling a language pack
+
+Individual language packs can be disabled by setting `g:polyglot_disabled`.
+
+```viml
+" ~/.vimrc
+let g:polyglot_disabled = ['css']
+```
+
+Note that disabiling languages won't make in general your vim startup any faster / slower (only for specific file type). Vim-polyglot is selection of language plugins that are loaded only on demand.
+
+## Updating
+
+You can either wait for new patch release with updates or run the `./build` script by yourself.
 
 ## Contributing
 
@@ -91,7 +119,3 @@ Feel free to add your language, and send pull-request.
 ## License
 
 See linked repositories for detailed license information.
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/sheerun/vim-polyglot/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

after/ftdetect/javascript.vim

@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+  
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Vim ftdetect file
+"
+" Language: JSX (JavaScript)
+" Maintainer: Max Wang <mxawng@gmail.com>
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+exec 'source '.fnameescape(expand('<sfile>:p:h:h').'/jsx-config.vim')
+
+fu! <SID>EnableJSX()
+  if g:jsx_pragma_required && !b:jsx_pragma_found | return 0 | endif
+  if g:jsx_ext_required && !exists('b:jsx_ext_found') | return 0 | endif
+  return 1
+endfu
+
+autocmd BufNewFile,BufRead *.jsx let b:jsx_ext_found = 1
+autocmd BufNewFile,BufRead *.jsx set filetype=javascript.jsx
+autocmd BufNewFile,BufRead *.js
+  \ if <SID>EnableJSX() | set filetype=javascript.jsx | endif
+
+endif

after/ftdetect/rspec.vim

@@ -1,2 +1,6 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rspec') == -1
+  
 autocmd BufReadPost,BufNewFile *_spec.rb set syntax=rspec
 autocmd BufReadPost,BufNewFile *_spec.rb setlocal commentstring=#\ %s
+
+endif

after/ftplugin/coffee.vim

@@ -0,0 +1,9 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
+  
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_words = '(:),\[:\],{:},<:>,' .
+    \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
+endif
+
+endif

after/ftplugin/haskell.vim

@@ -1,9 +0,0 @@
-" Vim ftplugin file
-" Language: Haskell
-" Maintainer: Tristan Ravitch
-
-" I don't fully understand what the vim-default ftplugin does, but I do know
-" that the three-part comment entry really messes up this indenter (I also
-" hate the leading '-'s it puts in on each line).  Disable it here.
-setlocal comments&
-setlocal comments=:--

after/ftplugin/jsx.vim

@@ -0,0 +1,21 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+  
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Vim ftplugin file
+"
+" Language: JSX (JavaScript)
+" Maintainer: Max Wang <mxawng@gmail.com>
+" Depends: pangloss/vim-javascript
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+" modified from html.vim
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_words = '(:),\[:\],{:},<:>,' .
+        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
+endif
+
+setlocal suffixesadd+=.jsx
+
+endif

after/ftplugin/puppet.vim

@@ -1,11 +1,20 @@
-inoremap <buffer> <silent> > ><Esc>:call <SID>puppetalign()<CR>A
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-function! s:puppetalign()
+  
-    let p = '^\s*\w+\s*[=+]>.*$'
+if !exists('g:puppet_align_hashes')
-    let lineContainsHashrocket = getline('.') =~# '^\s*\w+\s*[=+]>'
+    let g:puppet_align_hashes = 1
-    let hashrocketOnPrevLine = getline(line('.') - 1) =~# p
+endif
-    let hashrocketOnNextLine = getline(line('.') + 1) =~# p
+
-    if exists(':Tabularize') " && lineContainsHashrocket && (hashrocketOnPrevLine || hashrocketOnNextLine)
+if g:puppet_align_hashes && exists(':Tabularize')
+    inoremap <buffer> <silent> > ><Esc>:call <SID>puppetalign()<CR>a
+    function! s:puppetalign()
+        let p = '^\s*\w+\s*[=+]>.*$'
+        let column = strlen(substitute(getline('.')[0:col('.')],'\([^=]\|=[^>]\)','','g'))
+        let position = strlen(matchstr(getline('.')[0:col('.')],'.*=>\s*\zs.*'))
         Tabularize /=>/l1
         normal! 0
-    endif
+        echo repeat('\([^=]\|=[^>]\)*=>',column).'\s\{-\}'.repeat('.',position)
-endfunction
+        call search(repeat('\([^=]\|=[^>]\)*=>',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
+    endfunction
+endif
+
+endif

after/indent/html.vim

@@ -1,5 +1,7 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
@@ -31,3 +33,5 @@ function! GetCoffeeHtmlIndent(curlinenum)
   " Otherwise use html indenting.
   exec 'return ' s:htmlIndentExpr
 endfunction
+
+endif

after/indent/jsx.vim

@@ -0,0 +1,102 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+  
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Vim indent file
+"
+" Language: JSX (JavaScript)
+" Maintainer: Max Wang <mxawng@gmail.com>
+" Depends: pangloss/vim-javascript
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+" Do nothing if we don't find the @jsx pragma (and we care).
+exec 'source '.fnameescape(expand('<sfile>:p:h:h').'/jsx-config.vim')
+if g:jsx_pragma_required && !b:jsx_pragma_found | finish | endif
+
+" Do nothing if we don't have the .jsx extension (and we care).
+if g:jsx_ext_required && !exists('b:jsx_ext_found') | finish | endif
+
+" Prologue; load in XML indentation.
+if exists('b:did_indent')
+  let s:did_indent=b:did_indent
+  unlet b:did_indent
+endif
+exe 'runtime! indent/xml.vim'
+if exists('s:did_indent')
+  let b:did_indent=s:did_indent
+endif
+
+setlocal indentexpr=GetJsxIndent()
+
+" JS indentkeys
+setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e
+" XML indentkeys
+setlocal indentkeys+=*<Return>,<>>,<<>,/
+
+" Self-closing tag regex.
+let s:sctag = '^\s*\/>\s*;\='
+
+" Get all syntax types at the beginning of a given line.
+fu! SynSOL(lnum)
+  return map(synstack(a:lnum, 1), 'synIDattr(v:val, "name")')
+endfu
+
+" Get all syntax types at the end of a given line.
+fu! SynEOL(lnum)
+  let lnum = prevnonblank(a:lnum)
+  let col = strlen(getline(lnum))
+  return map(synstack(lnum, col), 'synIDattr(v:val, "name")')
+endfu
+
+" Check if a syntax attribute is XMLish.
+fu! SynAttrXMLish(synattr)
+  return a:synattr =~ "^xml" || a:synattr =~ "^jsx"
+endfu
+
+" Check if a synstack is XMLish (i.e., has an XMLish last attribute).
+fu! SynXMLish(syns)
+  return SynAttrXMLish(get(a:syns, -1))
+endfu
+
+" Check if a synstack has any XMLish attribute.
+fu! SynXMLishAny(syns)
+  for synattr in a:syns
+    if SynAttrXMLish(synattr)
+      return 1
+    endif
+  endfor
+  return 0
+endfu
+
+" Check if a synstack denotes the end of a JSX block.
+fu! SynJSXBlockEnd(syns)
+  return get(a:syns, -1) == 'jsBraces' && SynAttrXMLish(get(a:syns, -2))
+endfu
+
+" Cleverly mix JS and XML indentation.
+fu! GetJsxIndent()
+  let cursyn  = SynSOL(v:lnum)
+  let prevsyn = SynEOL(v:lnum - 1)
+
+  " Use XML indenting if the syntax at the end of the previous line was either
+  " JSX or was the closing brace of a jsBlock whose parent syntax was JSX.
+  if (SynXMLish(prevsyn) || SynJSXBlockEnd(prevsyn)) && SynXMLishAny(cursyn)
+    let ind = XmlIndentGet(v:lnum, 0)
+
+    " Align '/>' with '<' for multiline self-closing tags.
+    if getline(v:lnum) =~? s:sctag
+      let ind = ind - &sw
+    endif
+
+    " Then correct the indentation of any JSX following '/>'.
+    if getline(v:lnum - 1) =~? s:sctag
+      let ind = ind + &sw
+    endif
+  else
+    let ind = GetJavascriptIndent()
+  endif
+
+  return ind
+endfu
+
+endif

after/jsx-config.vim

@@ -0,0 +1,37 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+  
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Vimscript file
+"
+" Set up a bunch of configuration variables.
+"
+" Also check (if desired) whether or not the @jsx pragma is correctly included
+" in '%'.  Set the result in b:jsx_pragma_found.
+"
+" Language: JSX (JavaScript)
+" Maintainer: Max Wang <mxawng@gmail.com>
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+" Only check once.
+if exists('b:jsx_pragma_found')
+  finish
+endif
+
+" Whether the .jsx extension is required to enable JSX syntax/indent.
+if !exists('g:jsx_ext_required')
+  let g:jsx_ext_required = 1
+endif
+
+" Whether the @jsx pragma is required to enable JSX syntax/indent.
+if !exists('g:jsx_pragma_required')
+  let g:jsx_pragma_required = 0
+endif
+if !g:jsx_pragma_required | finish | endif
+
+" Look for the @jsx pragma.  It must be included in a docblock comment before
+" anything else in the file (except whitespace).
+let s:jsx_pragma_pattern = '\%^\_s*\/\*\*\%(\_.\%(\*\/\)\@!\)*@jsx\_.\{-}\*\/'
+let b:jsx_pragma_found = search(s:jsx_pragma_pattern, 'npw')
+
+endif

after/syntax/c.vim

@@ -1,19 +1,32 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
+  
 " Vim syntax file
-" Language:	C Additions
+" Language: C Additions
-" Maintainer:	Mikhail Wolfson <mywolfson@gmail.com>
+" Maintainer: Jon Haggblad <jon@haeggblad.com>
-" URL: http://web.mit.edu/wolfsonm
+" Contributor: Mikhail Wolfson <mywolfson@gmail.com>
-" Last Change:	2010 Dec. 3
+" URL: http://www.haeggblad.com
-" Version: 0.4
+" Last Change: 6 Sep 2014
-"
+" Version: 0.3
 " Changelog:
-"   0.4 - updates and fixes to cDelimiter to fix break with foldmethod=syntax,
+"   0.3 - integration of aftersyntaxc.vim
-"         entirely suggested and solved by Ivan Freitas
+"   0.2 - Cleanup
-"         <ivansichfreitas@gmail.com>
+"   0.1 - initial version.
-"   0.3 - updates and fixes to cUserFunctionPointer, thanks to 
+"
-"         Alexei <lxmzhv@gmail.com>
+" Syntax highlighting for functions in C.
-"   0.2 - change [] to operator
+"
-"   0.1 - initial upload, modification from vimscript#1201, Extended c.vim
+" Based on:
+"   http://stackoverflow.com/questions/736701/class-function-names-highlighting-in-vim
 
+" -----------------------------------------------------------------------------
+"  Highlight function names.
+" -----------------------------------------------------------------------------
+syn match    cCustomParen    "(" contains=cParen contains=cCppParen
+syn match    cCustomFunc     "\w\+\s*(\@=" contains=cCustomParen
+hi def link cCustomFunc  Function
+
+" -----------------------------------------------------------------------------
+"  Source: aftersyntaxc.vim
+" -----------------------------------------------------------------------------
 
 " Common ANSI-standard functions
 syn keyword cAnsiFunction	MULU_ DIVU_ MODU_ MUL_ DIV_ MOD_
@@ -61,7 +74,8 @@ syn keyword cAnsiFunction	wcstombs mbstowcs wctomb
 syn keyword cAnsiFunction	mbtowc mblen lldiv
 syn keyword cAnsiFunction	ldiv div llabs
 syn keyword cAnsiFunction	labs abs qsort
-syn keyword cAnsiFunction	bsearch system getenv
+"syn keyword cAnsiFunction	bsearch system getenv
+syn keyword cAnsiFunction	bsearch getenv
 syn keyword cAnsiFunction	exit atexit abort
 syn keyword cAnsiFunction	realloc malloc free
 syn keyword cAnsiFunction	calloc srand rand
@@ -238,42 +252,45 @@ syn keyword	cAnsiName	bitand not or_eq
 
 hi def link cAnsiFunction cFunction
 hi def link cAnsiName cIdentifier
-
+hi def link cFunction Function
-" Operators
+hi def link cIdentifier Identifier
-syn match cOperator	"\(<<\|>>\|[-+*/%&^|<>!=]\)="
-syn match cOperator	"<<\|>>\|&&\|||\|++\|--\|->"
-syn match cOperator	"[.!~*&%<>^|=,+-]"
-syn match cOperator	"/[^/*=]"me=e-1
-syn match cOperator	"/$"
-syn match cOperator "&&\|||"
-syn match cOperator	"[][]"
-
-" Preprocs
-syn keyword cDefined defined contained containedin=cDefine
-hi def link cDefined cDefine
-
-" Functions
-syn match cUserFunction "\<\h\w*\>\(\s\|\n\)*("me=e-1 contains=cType,cDelimiter,cDefine
-syn match cUserFunctionPointer "(\s*\*\s*\h\w*\s*)\(\s\|\n\)*(" contains=cDelimiter,cOperator
-
-hi def link cUserFunction cFunction
-hi def link cUserFunctionPointer cFunction
-
-" Delimiters
-syn match cDelimiter    "[();\\]"
-" foldmethod=syntax fix, courtesy of Ivan Freitas
-syn match cBraces display "[{}]"
-
 
 " Booleans
 syn keyword cBoolean true false TRUE FALSE
-
-
-" Links
-hi def link cFunction Function
-hi def link cIdentifier Identifier
-hi def link cDelimiter Delimiter
-" foldmethod=syntax fix, courtesy of Ivan Freitas
-hi def link cBraces Delimiter
 hi def link cBoolean Boolean
 
+" -----------------------------------------------------------------------------
+"  Additional optional highlighting
+" -----------------------------------------------------------------------------
+
+" Operators
+"syn match cOperator	"\(<<\|>>\|[-+*/%&^|<>!=]\)="
+"syn match cOperator	"<<\|>>\|&&\|||\|++\|--\|->"
+"syn match cOperator	"[.!~*&%<>^|=,+-]"
+"syn match cOperator	"/[^/*=]"me=e-1
+"syn match cOperator	"/$"
+"syn match cOperator "&&\|||"
+"syn match cOperator	"[][]"
+"
+"" Preprocs
+"syn keyword cDefined defined contained containedin=cDefine
+"hi def link cDefined cDefine
+
+"" Functions
+"syn match cUserFunction "\<\h\w*\>\(\s\|\n\)*("me=e-1 contains=cType,cDelimiter,cDefine
+"syn match cUserFunctionPointer "(\s*\*\s*\h\w*\s*)\(\s\|\n\)*(" contains=cDelimiter,cOperator
+"
+"hi def link cUserFunction cFunction
+"hi def link cUserFunctionPointer cFunction
+"
+"" Delimiters
+"syn match cDelimiter    "[();\\]"
+"" foldmethod=syntax fix, courtesy of Ivan Freitas
+"syn match cBraces display "[{}]"
+
+" Links
+"hi def link cDelimiter Delimiter
+" foldmethod=syntax fix, courtesy of Ivan Freitas
+"hi def link cBraces Delimiter
+
+endif

after/syntax/coffee.vim

@@ -1,20 +1,31 @@
-" This file describes a very basic syntax for TomDoc comments in a
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
-" CoffeeScript file.
+  
-"
+if exists('b:current_syntax')
-" For more information on TomDoc, check it out here: http://tomdoc.org/
+  let s:current_syntax=b:current_syntax
-"
+  unlet b:current_syntax
+endif
 
-syn keyword tomdocKeywords Returns containedin=coffeeComment contained
+if exists('s:current_syntax')
-syn keyword tomdocKeywords Throws containedin=coffeeComment contained
+  let b:current_syntax=s:current_syntax
-syn keyword tomdocKeywords Examples containedin=coffeeComment contained
+endif
-syn keyword tomdocKeywords Signature containedin=coffeeComment contained
 
-syn match tomdocArguments +\s*[A-Za-z0-9_\-&\*:]*\(\s*- \)+he=e-3 containedin=coffeeComment contained
+syn match   cjsxEntity       contained "&[^; \t]*;" contains=cjsxEntityPunct
+syn match   cjsxEntityPunct  contained "[&.;]"
 
-syn match tomdocDescriptions +\s*Public:+he=e-1 containedin=coffeeComment contained
+syn match   cjsxAttribProperty /[A-Za-z_][A-Za-z0-9_-]*/ contained
-syn match tomdocDescriptions +\s*Internal:+he=e-1 containedin=coffeeComment contained
+syn region  cjsxAttrib start=/\s[A-Za-z_][A-Za-z0-9_-]/hs=s+1 end=/=/ end=/\s[A-Za-z_]/me=e-2 end=+[/>]+me=e-1 contained contains=cjsxAttribProperty
-syn match tomdocDescriptions +\s*Deprecated:+he=e-1 containedin=coffeeComment contained
 
-hi default link tomdocDescriptions String
+syn region  cjsxBody start=+[^/]>+ms=s+2 start=/>/ms=s+1 end=+<\/+me=e-2 contained contains=cjsxElement,coffeeCurlies,cjsxEntity
-hi default link tomdocKeywords String
+
-hi default link tomdocArguments HELP
+syn region  cjsxElement start=/<@\=[A-Za-z_][A-Za-z0-9-_\.]*/ end=/\/>/ end=/<\/@\=[A-Za-z_][A-Za-z0-9-_\.]*>/ contains=cjsxOpenTag,cjsxBody,coffeeCurlies,coffeeString,cjsxAttrib,coffeeNumber,coffeeFloat
+
+syn cluster coffeeAll add=cjsxElement
+
+" The default highlighting.
+hi def link cjsxElement         Function
+hi def link cjsxTagName         Function
+hi def link cjsxEntity          Statement
+hi def link cjsxEntityPunct     Type
+hi def link cjsxAttribProperty  Type
+
+endif

after/syntax/cpp.vim

@@ -1,17 +1,21 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
+  
 " Vim syntax file
 " Language: C++ Additions
 " Maintainer: Jon Haggblad <jon@haeggblad.com>
 " URL: http://www.haeggblad.com
-" Last Change: 21 Apr 2014
+" Last Change: 21 Sep 2014
-" Version: 0.3
+" Version: 0.5
 " Changelog:
 "   0.1 - initial version.
 "   0.2 - C++14
 "   0.3 - Incorporate lastest changes from Mizuchi/STL-Syntax
+"   0.4 - Add template function highlight
+"   0.5 - Redo template function highlight to be more robust. Add options.
 "
-" Additional Vim syntax highlighting for C++ (including C++11)
+" Additional Vim syntax highlighting for C++ (including C++11/14)
 "
-" This file contains additional syntax highlighting that I use for my C++11/14
+" This file contains additional syntax highlighting that I use for C++11/14
 " development in Vim. Compared to the standard syntax highlighting for C++ it
 " adds highlighting of (user defined) functions and the containers and types
 " in the standard library / boost.
@@ -29,21 +33,35 @@
 " Based on the discussion in:
 "   http://stackoverflow.com/questions/736701/class-function-names-highlighting-in-vim
 " -----------------------------------------------------------------------------
-syn match    cCustomParen    "(" contains=cParen contains=cCppParen
-syn match    cCustomFunc     "\w\+\s*(\@=" contains=cCustomParen
-syn match    cCustomScope    "::"
-syn match    cCustomClass    "\w\+\s*::" contains=cCustomScope
 
+" Functions
+syn match   cCustomParen    "(" contains=cParen contains=cCppParen
+syn match   cCustomFunc     "\w\+\s*(\@=" contains=cCustomParen
 hi def link cCustomFunc  Function
 
-" Uncomment this to also highlight 'class::' and 'namespace::'
+" Template functions
-"hi def link cCustomClass Function
+if exists('g:cpp_experimental_template_highlight') && g:cpp_experimental_template_highlight
+    syn region  cCustomAngleBrackets matchgroup=AngleBracketContents start="\v%(<operator\_s*)@<!%(%(\_i|template\_s*)@<=\<[<=]@!|\<@<!\<[[:space:]<=]@!)" end='>' contains=@cppSTLgroup,cppStructure,cType,cCustomClass,cCustomAngleBrackets,cNumbers
+    syn match   cCustomBrack    "<\|>" contains=cCustomAngleBrackets
+    syn match   cCustomTemplateFunc "\w\+\s*<.*>(\@=" contains=cCustomBrack,cCustomAngleBrackets
+    hi def link cCustomTemplateFunc  Function
+endif
+
+" Class and namespace scope
+if exists('g:cpp_class_scope_highlight') && g:cpp_class_scope_highlight
+    syn match    cCustomScope    "::"
+    syn match    cCustomClass    "\w\+\s*::" contains=cCustomScope
+    hi def link cCustomClass Function  " disabled for now
+endif
 
 " Alternative syntax that is used in:
 "  http://www.vim.org/scripts/script.php?script_id=3064
 "syn match cUserFunction "\<\h\w*\>\(\s\|\n\)*("me=e-1 contains=cType,cDelimiter,cDefine
 "hi def link cCustomFunc  Function
 
+" Cluster for all the stdlib functions defined below
+syn cluster cppSTLgroup     contains=cppSTLfunction,cppSTLfunctional,cppSTLconstant,cppSTLnamespace,cppSTLtype,cppSTLexception,cppSTLiterator,cppSTLiterator_tagcppSTLenumcppSTLioscppSTLcast
+
 " -----------------------------------------------------------------------------
 "  Standard library types and functions.
 "
@@ -118,6 +136,7 @@ syntax keyword cppSTLfunctional binary_negate
 syntax keyword cppSTLfunctional bit_and
 syntax keyword cppSTLfunctional bit_not
 syntax keyword cppSTLfunctional bit_or
+syntax keyword cppSTLfunctional bit_xor
 syntax keyword cppSTLfunctional divides
 syntax keyword cppSTLfunctional equal_to
 syntax keyword cppSTLfunctional greater
@@ -154,7 +173,7 @@ syntax keyword cppSTLfunction back
 syntax keyword cppSTLfunction back_inserter
 syntax keyword cppSTLfunction bad
 syntax keyword cppSTLfunction beg
-syntax keyword cppSTLfunction begin
+"syntax keyword cppSTLfunction begin
 syntax keyword cppSTLfunction binary_compose
 syntax keyword cppSTLfunction binary_negate
 syntax keyword cppSTLfunction binary_search
@@ -181,14 +200,14 @@ syntax keyword cppSTLfunction count
 syntax keyword cppSTLfunction count_if
 syntax keyword cppSTLfunction c_str
 syntax keyword cppSTLfunction ctime
-syntax keyword cppSTLfunction data
+"syntax keyword cppSTLfunction data
 syntax keyword cppSTLfunction denorm_min
 syntax keyword cppSTLfunction destroy
 syntax keyword cppSTLfunction difftime
 syntax keyword cppSTLfunction distance
 syntax keyword cppSTLfunction div
 syntax keyword cppSTLfunction empty
-syntax keyword cppSTLfunction end
+"syntax keyword cppSTLfunction end
 syntax keyword cppSTLfunction eof
 syntax keyword cppSTLfunction epsilon
 syntax keyword cppSTLfunction equal
@@ -401,7 +420,7 @@ syntax keyword cppSTLfunction signal
 syntax keyword cppSTLfunction signaling_NaN
 syntax keyword cppSTLfunction sin
 syntax keyword cppSTLfunction sinh
-syntax keyword cppSTLfunction size
+"syntax keyword cppSTLfunction size
 syntax keyword cppSTLfunction sort
 syntax keyword cppSTLfunction sort_heap
 syntax keyword cppSTLfunction splice
@@ -443,13 +462,13 @@ syntax keyword cppSTLfunction swap_ranges
 syntax keyword cppSTLfunction swprintf
 syntax keyword cppSTLfunction swscanf
 syntax keyword cppSTLfunction sync_with_stdio
-syntax keyword cppSTLfunction system
+"syntax keyword cppSTLfunction system
 syntax keyword cppSTLfunction tan
 syntax keyword cppSTLfunction tanh
 syntax keyword cppSTLfunction tellg
 syntax keyword cppSTLfunction tellp
-syntax keyword cppSTLfunction test
+"syntax keyword cppSTLfunction test
-syntax keyword cppSTLfunction time
+"syntax keyword cppSTLfunction time
 syntax keyword cppSTLfunction tmpfile
 syntax keyword cppSTLfunction tmpnam
 syntax keyword cppSTLfunction tolower
@@ -744,6 +763,7 @@ syntax keyword cppSTLconstant WCHAR_MAX
 if !exists("cpp_no_cpp11")
     syntax keyword cppSTLtype nullptr_t max_align_t
     syntax keyword cppSTLtype type_index
+    syntax keyword cppSTLconstant nullptr
 
     " type_traits
     syntax keyword cppSTLtype is_void
@@ -1036,7 +1056,7 @@ if !exists("cpp_no_cpp11")
     syntax keyword cppSTLconstant FLT_EVAL_METHOD
 
     " complex
-    syntax keyword cppSTLfunction proj
+    "syntax keyword cppSTLfunction proj
 
     " random
     syntax keyword cppSTLtype linear_congruential_engine
@@ -1294,6 +1314,10 @@ if !exists("cpp_no_cpp11")
     syntax keyword cppSTLtype minutes
     syntax keyword cppSTLtype hours
 
+    "raw string literals
+    syntax region cppRawString matchgroup=cppRawDelimiter start=@\%(u8\|[uLU]\)\=R"\z([[:alnum:]_{}[\]#<>%:;.?*\+\-/\^&|~!=,"']\{,16}\)(@ end=/)\z1"/ contains=@Spell
+
+    syn match cNumber "0b[01]\+"
 endif " C++11
 
 if !exists("cpp_no_cpp14")
@@ -1338,5 +1362,9 @@ if version >= 508 || !exists("did_cpp_syntax_inits")
   HiLink cppSTLenum         Typedef
   HiLink cppSTLios          Function
   HiLink cppSTLcast         Statement " be consistent with official syntax
+  HiLink cppRawString       String 
+  HiLink cppRawDelimiter    Delimiter
   delcommand HiLink
 endif
+
+endif

after/syntax/css.vim

@@ -1,6 +0,0 @@
-" Language:     Colorful CSS Color Preview
-" Author:       Aristotle Pagaltzis <pagaltzis@gmx.de>
-
-if !( has('gui_running') || &t_Co==256 ) | finish | endif
-
-call css_color#init('css', 'cssMediaBlock,cssFunction,cssDefinition,cssAttrRegion,cssComment')

after/syntax/haml.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
 " Language:    CoffeeScript
 " Maintainer:  Sven Felix Oberquelle <Svelix.Github@gmail.com>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -11,3 +13,5 @@ syn region  hamlCoffeescriptFilter matchgroup=hamlFilter
 \                                  end="^\%(\z1 \| *$\)\@!"
 \                                  contains=@hamlCoffeeScript,hamlInterpolation
 \                                  keepend
+
+endif

after/syntax/help.vim

@@ -1,8 +1,18 @@
-let b:current_syntax = ''
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-unlet b:current_syntax
+  
+" Extends standard help syntax with highlighting of Scala code.
+"
+" Place code between !sc! and !/sc! delimiters. These will be hidden if Vim is
+" built with conceal support.
+
+unlet! b:current_syntax
+
 syntax include @ScalaCode syntax/scala.vim
+
 if has('conceal')
   syntax region rgnScala matchgroup=Ignore concealends start='!sc!' end='!/sc!' contains=@ScalaCode
 else
   syntax region rgnScala matchgroup=Ignore start='!sc!' end='!/sc!' contains=@ScalaCode
 endif
+
+endif

after/syntax/html.vim

@@ -1,5 +1,7 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
@@ -9,10 +11,48 @@ syn region coffeeScript start=#<script [^>]*type="text/coffeescript"[^>]*>#
 \                       end=#</script>#me=s-1 keepend
 \                       contains=@htmlCoffeeScript,htmlScriptTag,@htmlPreproc
 \                       containedin=htmlHead
-" Language:     Colorful CSS Color Preview
-" Author:       Aristotle Pagaltzis <pagaltzis@gmx.de>
 
-if !( has('gui_running') || &t_Co==256 ) | finish | endif
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
+  
+" Language: OpenGL Shading Language
+" Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
 
-" default html syntax should already be including the css syntax
+syn include @GLSL syntax/glsl.vim
-syn cluster colorableGroup add=htmlString,htmlCommentPart
+syn region ShaderScript
+      \ start="<script [^>]*type=\('\|\"\)x-shader/x-\(vertex\|fragment\)\('\|\"\)[^>]*>"
+      \ keepend
+      \ end="</script>"me=s-1
+      \ contains=@GLSL,htmlScriptTag,@htmlPreproc
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
+  
+if !exists("g:less_html_style_tags")
+  let g:less_html_style_tags = 1
+endif
+
+if !g:less_html_style_tags
+  finish
+endif
+
+" Unset (but preserve) so that less will run.
+if exists("b:current_syntax")
+   let s:pre_less_cur_syn = b:current_syntax
+   unlet b:current_syntax
+endif
+
+" Inspired by code from github.com/kchmck/vim-coffee-script
+" and the html syntax file included with vim 7.4.
+
+syn include @htmlLess syntax/less.vim
+
+" We have to explicitly add to htmlHead (containedin) as that region specifies 'contains'.
+syn region lessStyle start=+<style [^>]*type *=[^>]*text/less[^>]*>+ keepend end=+</style>+ contains=@htmlLess,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc containedin=htmlHead
+
+" Reset since 'less' isn't really the current_syntax.
+if exists("s:pre_less_cur_syn")
+   let b:current_syntax = s:pre_less_cur_syn
+endif
+
+endif

after/syntax/jsx.vim

@@ -0,0 +1,47 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+  
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Vim syntax file
+"
+" Language: JSX (JavaScript)
+" Maintainer: Max Wang <mxawng@gmail.com>
+" Depends: pangloss/vim-javascript
+"
+" CREDITS: Inspired by Facebook.
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+" Do nothing if we don't find the @jsx pragma (and we care).
+exec 'source '.fnameescape(expand('<sfile>:p:h:h').'/jsx-config.vim')
+if g:jsx_pragma_required && !b:jsx_pragma_found | finish | endif
+
+" Do nothing if we don't have the .jsx extension (and we care).
+if g:jsx_ext_required && !exists('b:jsx_ext_found') | finish | endif
+
+" Prologue; load in XML syntax.
+if exists('b:current_syntax')
+  let s:current_syntax=b:current_syntax
+  unlet b:current_syntax
+endif
+syn include @XMLSyntax syntax/xml.vim
+if exists('s:current_syntax')
+  let b:current_syntax=s:current_syntax
+endif
+
+" Highlight JSX regions as XML; recursively match.
+syn region jsxRegion contains=@XMLSyntax,jsxRegion,jsBlock,javascriptBlock
+  \ start=+<\@<!<\z([a-zA-Z][a-zA-Z0-9:\-.]*\)+
+  \ skip=+<!--\_.\{-}-->+
+  \ end=+</\z1\_\s\{-}>+
+  \ end=+/>+
+  \ keepend
+  \ extend
+
+" JSX attributes should color as JS.  Note the trivial end pattern; we let
+" jsBlock take care of ending the region.
+syn region xmlString contained start=+{+ end=++ contains=jsBlock,javascriptBlock
+
+" Add jsxRegion to the lowest-level JS syntax cluster.
+syn cluster jsExpression add=jsxRegion
+
+endif

after/syntax/less.vim

@@ -1,6 +0,0 @@
-" Language:     Colorful CSS Color Preview
-" Author:       Aristotle Pagaltzis <pagaltzis@gmx.de>
-
-if !( has('gui_running') || &t_Co==256 ) | finish | endif
-
-call css_color#init('css', 'lessVariableValue,lessDefinition,lessComment')

after/syntax/rspec.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rspec') == -1
+  
 "
 " An rspec syntax file
 " Originally from http://www.vim.org/scripts/script.php?script_id=2286
@@ -30,3 +32,5 @@ syntax keyword rspecMessageExpectation advise any_args any_number_of_times anyth
 highlight link rspecMessageExpectation Function
 
 let b:current_syntax = 'rspec'
+
+endif

after/syntax/ruby.vim

@@ -1,23 +1,5 @@
-" This file describes a very basic syntax for TomDoc comments in a Ruby file.
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yard') == -1
-"
+  
-" For more information on TomDoc, check it out here: http://tomdoc.org/
-"
-
-syn keyword tomdocKeywords Returns containedin=rubyComment contained
-syn keyword tomdocKeywords Yields containedin=rubyComment contained
-syn keyword tomdocKeywords Raises containedin=rubyComment contained
-syn keyword tomdocKeywords Examples containedin=rubyComment contained
-syn keyword tomdocKeywords Signature containedin=rubyComment contained
-
-syn match tomdocArguments +\s*[A-Za-z0-9_\-&\*:]*\(\s*- \)+he=e-3 containedin=rubyComment contained
-
-syn match tomdocDescriptions +\s*Public:+he=e-1 containedin=rubyComment contained
-syn match tomdocDescriptions +\s*Internal:+he=e-1 containedin=rubyComment contained
-syn match tomdocDescriptions +\s*Deprecated:+he=e-1 containedin=rubyComment contained
-
-hi default link tomdocDescriptions String
-hi default link tomdocKeywords String
-hi default link tomdocArguments HELP
 " Ruby syntax extensions for highlighting YARD documentation.
 "
 " Author: Joel Holdbrooks <https://github.com/noprompt>
@@ -144,3 +126,5 @@ hi def link yardParametricType yardComment
 hi def link yardArrow yardComment
 hi def link yardHashAngle yardComment
 hi def link yardHashCurly yardComment
+
+endif

after/syntax/rust.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+  
 if !exists('g:rust_conceal') || !has('conceal') || &enc != 'utf-8'
 	finish
 endif
@@ -30,4 +32,4 @@ if !exists('g:rust_conceal_mod_path')
     hi! link Conceal Operator
 endif
 
-setlocal conceallevel=2
+endif

after/syntax/sass.vim

@@ -1,6 +0,0 @@
-" Language:     Colorful CSS Color Preview
-" Author:       Aristotle Pagaltzis <pagaltzis@gmx.de>
-
-if !( has('gui_running') || &t_Co==256 ) | finish | endif
-
-call css_color#init('css', 'sassCssAttribute,sassComment,sassCssComment')

after/syntax/stylus.vim

@@ -1,6 +0,0 @@
-" Language:     Colorful CSS Color Preview
-" Author:       Aristotle Pagaltzis <pagaltzis@gmx.de>
-
-if !( has('gui_running') || &t_Co==256 ) | finish | endif
-
-call css_color#init('css', 'stylusCssAttribute,stylusComment,cssComment')

after/syntax/tex.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
+  
 " adds support for cleverref package
 " \Cref, \cref, \cpageref, \labelcref, \labelcpageref
 syn region texRefZone		matchgroup=texStatement start="\\Cref{"				end="}\|%stopzone\>"	contains=@texRefGroup
@@ -7,3 +9,5 @@ syn region texRefZone		matchgroup=texStatement start="\\\(label\|\)c\(page\|\)re
 syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>"
 syn match texInputFile  "\\lstinputlisting\s*\(\[.*\]\)\={.\{-}}" contains=texStatement,texInputCurlies,texInputFileOpt
 syn match texZone "\\lstinline\s*\(\[.*\]\)\={.\{-}}"
+
+endif

after/syntax/vim.vim

@@ -1,6 +0,0 @@
-" Language:     Colorful CSS Color Preview
-" Author:       Aristotle Pagaltzis <pagaltzis@gmx.de>
-
-if !( has('gui_running') || &t_Co==256 ) | finish | endif
-
-call css_color#init('any', 'vimHiGuiRgb,vimComment,vimLineComment')

autoload/coffee.vim

@@ -1,5 +1,7 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
@@ -52,3 +54,5 @@ function! coffee#CoffeeSetUpErrorFormat()
                          \%f:%l:%c:\ error:\ %m,
                          \%-G%.%#
 endfunction
+
+endif

autoload/css_color.vim

@@ -1,559 +0,0 @@
-" Language:     Colorful CSS Color Preview
-" Author:       Aristotle Pagaltzis <pagaltzis@gmx.de>
-" Last Change:  2014-01-14
-" Licence:      No Warranties. WTFPL. But please tell me!
-" Version:      1.0
-
-if v:version < 700
-	echoerr printf('Vim 7 is required for css-color (this is only %d.%d)',v:version/100,v:version%100)
-	finish
-endif
-
-if !( has('gui_running') || &t_Co==256 ) | finish | endif
-
-function! s:rgb2color(r,g,b)
-	" Convert 80% -> 204, 100% -> 255, etc.
-	let rgb = map( [a:r,a:g,a:b], 'v:val =~ "%$" ? ( 255 * v:val ) / 100 : v:val' )
-	return printf( '%02x%02x%02x', rgb[0], rgb[1], rgb[2] )
-endfunction
-
-function! s:hsl2color(h,s,l)
-	" Convert 80% -> 0.8, 100% -> 1.0, etc.
-	let [s,l] = map( [a:s, a:l], 'v:val =~ "%$" ? v:val / 100.0 : v:val + 0.0' )
-	" algorithm transcoded to vim from http://www.w3.org/TR/css3-color/#hsl-color
-	let hh = ( a:h % 360 ) / 360.0
-	let m2 = l <= 0.5 ? l * ( s + 1 ) : l + s - l * s
-	let m1 = l * 2 - m2
-	let rgb = []
-	for h in [ hh + (1/3.0), hh, hh - (1/3.0) ]
-		let h = h < 0 ? h + 1 : h > 1 ? h - 1 : h
-		let v =
-			\ h * 6 < 1 ? m1 + ( m2 - m1 ) * h * 6 :
-			\ h * 2 < 1 ? m2 :
-			\ h * 3 < 2 ? m1 + ( m2 - m1 ) * ( 2/3.0 - h ) * 6 :
-			\ m1
-		if v > 1.0 | return '' | endif
-		let rgb += [ float2nr( 255 * v ) ]
-	endfor
-	return printf( '%02x%02x%02x', rgb[0], rgb[1], rgb[2] )
-endfunction
-
-let s:hex={}
-for i in range(0, 255)
-	let s:hex[ printf( '%02x', i ) ] = i
-endfor
-
-if has('gui_running')
-	let s:is_gui = 1
-else
-	let s:is_gui = 0
-
-	" preset 16 vt100 colors
-	let s:xtermcolor = [
-		\ [ 0x00, 0x00, 0x00,  0 ],
-		\ [ 0xCD, 0x00, 0x00,  1 ],
-		\ [ 0x00, 0xCD, 0x00,  2 ],
-		\ [ 0xCD, 0xCD, 0x00,  3 ],
-		\ [ 0x00, 0x00, 0xEE,  4 ],
-		\ [ 0xCD, 0x00, 0xCD,  5 ],
-		\ [ 0x00, 0xCD, 0xCD,  6 ],
-		\ [ 0xE5, 0xE5, 0xE5,  7 ],
-		\ [ 0x7F, 0x7F, 0x7F,  8 ],
-		\ [ 0xFF, 0x00, 0x00,  9 ],
-		\ [ 0x00, 0xFF, 0x00, 10 ],
-		\ [ 0xFF, 0xFF, 0x00, 11 ],
-		\ [ 0x5C, 0x5C, 0xFF, 12 ],
-		\ [ 0xFF, 0x00, 0xFF, 13 ],
-		\ [ 0x00, 0xFF, 0xFF, 14 ],
-		\ [ 0xFF, 0xFF, 0xFF, 15 ]]
-	" grayscale ramp
-	" (value is 8+10*lum for lum in 0..23)
-	let s:xtermcolor += [
-		\ [ 0x08, 0x08, 0x08, 232 ],
-		\ [ 0x12, 0x12, 0x12, 233 ],
-		\ [ 0x1C, 0x1C, 0x1C, 234 ],
-		\ [ 0x26, 0x26, 0x26, 235 ],
-		\ [ 0x30, 0x30, 0x30, 236 ],
-		\ [ 0x3A, 0x3A, 0x3A, 237 ],
-		\ [ 0x44, 0x44, 0x44, 238 ],
-		\ [ 0x4E, 0x4E, 0x4E, 239 ],
-		\ [ 0x58, 0x58, 0x58, 240 ],
-		\ [ 0x62, 0x62, 0x62, 241 ],
-		\ [ 0x6C, 0x6C, 0x6C, 242 ],
-		\ [ 0x76, 0x76, 0x76, 243 ],
-		\ [ 0x80, 0x80, 0x80, 244 ],
-		\ [ 0x8A, 0x8A, 0x8A, 245 ],
-		\ [ 0x94, 0x94, 0x94, 246 ],
-		\ [ 0x9E, 0x9E, 0x9E, 247 ],
-		\ [ 0xA8, 0xA8, 0xA8, 248 ],
-		\ [ 0xB2, 0xB2, 0xB2, 249 ],
-		\ [ 0xBC, 0xBC, 0xBC, 250 ],
-		\ [ 0xC6, 0xC6, 0xC6, 251 ],
-		\ [ 0xD0, 0xD0, 0xD0, 252 ],
-		\ [ 0xDA, 0xDA, 0xDA, 253 ],
-		\ [ 0xE4, 0xE4, 0xE4, 254 ],
-		\ [ 0xEE, 0xEE, 0xEE, 255 ]]
-
-	" the 6 values used in the xterm color cube
-	"                    0    95   135   175   215   255
-	let s:cubergb = [ 0x00, 0x5F, 0x87, 0xAF, 0xD7, 0xFF ]
-
-	" 0..255 mapped to 0..5 based on the color cube values
-	let s:xvquant = repeat([0],48)
-				\ + repeat([1],68)
-				\ + repeat([2],40)
-				\ + repeat([3],40)
-				\ + repeat([4],40)
-				\ + repeat([5],20)
-	" tweak the mapping for the exact matches (0 and 1 already correct)
-	let s:xvquant[s:cubergb[2]] = 2
-	let s:xvquant[s:cubergb[3]] = 3
-	let s:xvquant[s:cubergb[4]] = 4
-	let s:xvquant[s:cubergb[5]] = 5
-
-	" selects the nearest xterm color for a rgb value like #FF0000
-	function! s:rgb2xterm(color)
-		let best_match=0
-		let smallest_distance = 10000000000
-		let color = tolower(a:color)
-		let r = s:hex[color[0:1]]
-		let g = s:hex[color[2:3]]
-		let b = s:hex[color[4:5]]
-
-		let vr = s:xvquant[r]
-		let vg = s:xvquant[g]
-		let vb = s:xvquant[b]
-		let cidx = vr * 36 + vg * 6 + vb + 16
-		let ccol = [ s:cubergb[vr], s:cubergb[vg], s:cubergb[vb], cidx ]
-
-		for [tr,tg,tb,idx] in [ ccol ] + s:xtermcolor
-			let dr = tr - r
-			let dg = tg - g
-			let db = tb - b
-			let distance = dr*dr + dg*dg + db*db
-			if distance == 0 | return idx | endif
-			if distance > smallest_distance | continue | endif
-			let smallest_distance = distance
-			let best_match = idx
-		endfor
-		return best_match
-	endfunction
-endif
-
-let s:pattern_color = {}
-let s:color_fg      = {}
-let s:color_bg      = {}
-let [s:hi_cmd, s:black, s:white] = s:is_gui
-	\ ? ['hi %s  guibg=#%s   guifg=%s', '#000000', '#ffffff']
-	\ : ['hi %s ctermbg=%s ctermfg=%s', 0, 15]
-function! s:create_syn_match()
-
-	let pattern = submatch(0)
-
-	if has_key( b:has_pattern_syn, pattern ) | return | endif
-	let b:has_pattern_syn[pattern] = 1
-
-	let rgb_color = get( s:pattern_color, pattern, '' )
-
-	if ! strlen( rgb_color )
-		let hexcolor = submatch(1)
-		let funcname = submatch(2)
-
-		if funcname == 'rgb'
-			let rgb_color = s:rgb2color(submatch(3),submatch(4),submatch(5))
-		elseif funcname == 'hsl'
-			let rgb_color = s:hsl2color(submatch(3),submatch(4),submatch(5))
-		elseif strlen(hexcolor) == 6
-			let rgb_color = tolower(hexcolor)
-		elseif strlen(hexcolor) == 3
-			let rgb_color = substitute(tolower(hexcolor), '\(.\)', '\1\1', 'g')
-		else
-			throw 'css_color: create_syn_match invoked on bad match data'
-		endif
-
-		let s:pattern_color[pattern] = rgb_color
-	endif
-
-	if ! has_key( b:has_color_hi, rgb_color )
-		" check GUI flag early here to avoid pure-overhead caching
-		let syn_bg = s:is_gui ? rgb_color : get( s:color_bg, rgb_color, '' )
-		if ! strlen(syn_bg)
-			let syn_bg = s:rgb2xterm(rgb_color)
-			let s:color_bg[rgb_color] = syn_bg
-		endif
-
-		let syn_fg = get( s:color_fg, rgb_color, '' )
-		if ! strlen(syn_fg)
-			let r = s:hex[rgb_color[0:1]]
-			let g = s:hex[rgb_color[2:3]]
-			let b = s:hex[rgb_color[4:5]]
-			let syn_fg = r*30 + g*59 + b*11 > 12000 ? s:black : s:white
-			let s:color_fg[rgb_color] = syn_fg
-		endif
-	endif
-
-	let group = 'BG' . rgb_color
-
-	if ! has_key( b:has_color_hi, rgb_color )
-		exe printf( s:hi_cmd, group, syn_bg, syn_fg )
-		let b:has_color_hi[rgb_color] = 1
-	endif
-
-	" iff pattern ends on word character, require word break to match
-	if pattern =~ '\>$' | let pattern .= '\>' | endif
-	exe 'syn match' group '/'.escape(pattern, '/').'/ contained containedin=@colorableGroup'
-
-	return ''
-endfunction
-
-function! s:update_matches()
-	call filter(b:color_match_id, 'matchdelete(v:val)')
-	if &l:cursorline
-		" adds matches based that duplicate the highlighted colors on the current line
-		let lnr = line('.')
-		let group = ''
-		let groupstart = 0
-		let endcol = col('$')
-		for col in range( 1, endcol )
-			let nextgroup = col < endcol ? synIDattr( synID( lnr, col, 1 ), 'name' ) : ''
-			if group == nextgroup | continue | endif
-			if group =~ '^BG\x\{6}$'
-				let regex = '\%'.lnr.'l\%'.groupstart.'c'.repeat( '.', col - groupstart )
-				let match = matchadd( group, regex, -1 )
-				let b:color_match_id += [ match ]
-			endif
-			let group = nextgroup
-			let groupstart = col
-		endfor
-	endif
-endfunction
-
-let s:_hexcolor   = '#\(\x\{3}\|\x\{6}\)\>' " submatch 1
-let s:_funcname   = '\(rgb\|hsl\)a\?' " submatch 2
-let s:_numval     = '\(\d\{1,3}%\?\)' " submatch 3,4,5
-let s:_ws_        = '\s*'
-let s:_listsep    = s:_ws_ . ',' . s:_ws_
-let s:_otherargs_ = '\%(,[^)]*\)\?'
-let s:_funcexpr   = s:_funcname . '[(]' . s:_numval . s:_listsep . s:_numval . s:_listsep . s:_numval . s:_ws_ . s:_otherargs_ . '[)]'
-let s:_csscolor   = s:_hexcolor . '\|' . s:_funcexpr
-" N.B. these substitute() calls are here just for the side effect
-"      of invoking s:create_syn_match during substitution -- because
-"      match() and friends do not allow finding all matches in a single
-"      scan without examining the start of the string over and over
-function! s:parse_css_screen()
-	call substitute( join( getline('w0','w$'), "\n" ), s:_csscolor, '\=s:create_syn_match()', 'g' )
-	call s:update_matches()
-endfunction
-function! s:parse_any_screen()
-	call substitute( join( getline('w0','w$'), "\n" ), s:_hexcolor, '\=s:create_syn_match()', 'g' )
-	call s:update_matches()
-endfunction
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-function! css_color#init(type, groups)
-	exe 'syn cluster colorableGroup contains=' . a:groups
-
-	let b:has_color_hi    = {}
-	let b:has_pattern_syn = {}
-	let b:color_match_id  = []
-
-	augroup CSSColor
-		autocmd! * <buffer>
-		exe 'autocmd CursorMoved,CursorMovedI <buffer> call s:parse_'.a:type.'_screen()'
-	augroup END
-
-	do CSSColor CursorMoved <buffer>
-
-	if a:type != 'css' | return | endif
-
-	hi BG000000 guibg=#000000 guifg=#FFFFFF ctermbg=16  ctermfg=231
-	hi BG000080 guibg=#000080 guifg=#FFFFFF ctermbg=235 ctermfg=231
-	hi BG00008b guibg=#00008B guifg=#FFFFFF ctermbg=4   ctermfg=231
-	hi BG0000cd guibg=#0000CD guifg=#FFFFFF ctermbg=4   ctermfg=231
-	hi BG0000ff guibg=#0000FF guifg=#FFFFFF ctermbg=4   ctermfg=231
-	hi BG006400 guibg=#006400 guifg=#FFFFFF ctermbg=235 ctermfg=231
-	hi BG008000 guibg=#008000 guifg=#FFFFFF ctermbg=2   ctermfg=231
-	hi BG008080 guibg=#008080 guifg=#FFFFFF ctermbg=30  ctermfg=231
-	hi BG008b8b guibg=#008B8B guifg=#FFFFFF ctermbg=30  ctermfg=231
-	hi BG00bfff guibg=#00BFFF guifg=#000000 ctermbg=6   ctermfg=16
-	hi BG00ced1 guibg=#00CED1 guifg=#000000 ctermbg=6   ctermfg=16
-	hi BG00fa9a guibg=#00FA9A guifg=#000000 ctermbg=6   ctermfg=16
-	hi BG00ff00 guibg=#00FF00 guifg=#000000 ctermbg=10  ctermfg=16
-	hi BG00ff7f guibg=#00FF7F guifg=#000000 ctermbg=6   ctermfg=16
-	hi BG00ffff guibg=#00FFFF guifg=#000000 ctermbg=51  ctermfg=16
-	hi BG191970 guibg=#191970 guifg=#FFFFFF ctermbg=237 ctermfg=231
-	hi BG1e90ff guibg=#1E90FF guifg=#000000 ctermbg=12  ctermfg=16
-	hi BG20b2aa guibg=#20B2AA guifg=#000000 ctermbg=37  ctermfg=16
-	hi BG228b22 guibg=#228B22 guifg=#FFFFFF ctermbg=2   ctermfg=231
-	hi BG2e8b57 guibg=#2E8B57 guifg=#FFFFFF ctermbg=240 ctermfg=231
-	hi BG2f4f4f guibg=#2F4F4F guifg=#FFFFFF ctermbg=238 ctermfg=231
-	hi BG32cd32 guibg=#32CD32 guifg=#000000 ctermbg=2   ctermfg=16
-	hi BG3cb371 guibg=#3CB371 guifg=#000000 ctermbg=71  ctermfg=16
-	hi BG40e0d0 guibg=#40E0D0 guifg=#000000 ctermbg=80  ctermfg=16
-	hi BG4169e1 guibg=#4169E1 guifg=#FFFFFF ctermbg=12  ctermfg=231
-	hi BG4682b4 guibg=#4682B4 guifg=#FFFFFF ctermbg=67  ctermfg=231
-	hi BG483d8b guibg=#483D8B guifg=#FFFFFF ctermbg=240 ctermfg=231
-	hi BG48d1cc guibg=#48D1CC guifg=#000000 ctermbg=80  ctermfg=16
-	hi BG4b0082 guibg=#4B0082 guifg=#FFFFFF ctermbg=238 ctermfg=231
-	hi BG556b2f guibg=#556B2F guifg=#FFFFFF ctermbg=239 ctermfg=231
-	hi BG5f9ea0 guibg=#5F9EA0 guifg=#000000 ctermbg=73  ctermfg=16
-	hi BG6495ed guibg=#6495ED guifg=#000000 ctermbg=12  ctermfg=16
-	hi BG66cdaa guibg=#66CDAA guifg=#000000 ctermbg=79  ctermfg=16
-	hi BG696969 guibg=#696969 guifg=#FFFFFF ctermbg=242 ctermfg=231
-	hi BG6a5acd guibg=#6A5ACD guifg=#FFFFFF ctermbg=12  ctermfg=231
-	hi BG6b8e23 guibg=#6B8E23 guifg=#FFFFFF ctermbg=241 ctermfg=231
-	hi BG708090 guibg=#708090 guifg=#000000 ctermbg=66  ctermfg=16
-	hi BG778899 guibg=#778899 guifg=#000000 ctermbg=102 ctermfg=16
-	hi BG7b68ee guibg=#7B68EE guifg=#000000 ctermbg=12  ctermfg=16
-	hi BG7cfc00 guibg=#7CFC00 guifg=#000000 ctermbg=3   ctermfg=16
-	hi BG7fff00 guibg=#7FFF00 guifg=#000000 ctermbg=3   ctermfg=16
-	hi BG7fffd4 guibg=#7FFFD4 guifg=#000000 ctermbg=122 ctermfg=16
-	hi BG800000 guibg=#800000 guifg=#FFFFFF ctermbg=88  ctermfg=231
-	hi BG800080 guibg=#800080 guifg=#FFFFFF ctermbg=240 ctermfg=231
-	hi BG808000 guibg=#808000 guifg=#FFFFFF ctermbg=240 ctermfg=231
-	hi BG808080 guibg=#808080 guifg=#000000 ctermbg=244 ctermfg=16
-	hi BG87ceeb guibg=#87CEEB guifg=#000000 ctermbg=117 ctermfg=16
-	hi BG87cefa guibg=#87CEFA guifg=#000000 ctermbg=117 ctermfg=16
-	hi BG8a2be2 guibg=#8A2BE2 guifg=#FFFFFF ctermbg=12  ctermfg=231
-	hi BG8b0000 guibg=#8B0000 guifg=#FFFFFF ctermbg=88  ctermfg=231
-	hi BG8b008b guibg=#8B008B guifg=#FFFFFF ctermbg=5   ctermfg=231
-	hi BG8b4513 guibg=#8B4513 guifg=#FFFFFF ctermbg=94  ctermfg=231
-	hi BG8fbc8f guibg=#8FBC8F guifg=#000000 ctermbg=108 ctermfg=16
-	hi BG90ee90 guibg=#90EE90 guifg=#000000 ctermbg=249 ctermfg=16
-	hi BG9370d8 guibg=#9370D8 guifg=#000000 ctermbg=12  ctermfg=16
-	hi BG9400d3 guibg=#9400D3 guifg=#FFFFFF ctermbg=5   ctermfg=231
-	hi BG98fb98 guibg=#98FB98 guifg=#000000 ctermbg=250 ctermfg=16
-	hi BG9932cc guibg=#9932CC guifg=#FFFFFF ctermbg=5   ctermfg=231
-	hi BG9acd32 guibg=#9ACD32 guifg=#000000 ctermbg=3   ctermfg=16
-	hi BGa0522d guibg=#A0522D guifg=#FFFFFF ctermbg=130 ctermfg=231
-	hi BGa52a2a guibg=#A52A2A guifg=#FFFFFF ctermbg=124 ctermfg=231
-	hi BGa9a9a9 guibg=#A9A9A9 guifg=#000000 ctermbg=248 ctermfg=16
-	hi BGadd8e6 guibg=#ADD8E6 guifg=#000000 ctermbg=152 ctermfg=16
-	hi BGadff2f guibg=#ADFF2F guifg=#000000 ctermbg=3   ctermfg=16
-	hi BGafeeee guibg=#AFEEEE guifg=#000000 ctermbg=159 ctermfg=16
-	hi BGb0c4de guibg=#B0C4DE guifg=#000000 ctermbg=152 ctermfg=16
-	hi BGb0e0e6 guibg=#B0E0E6 guifg=#000000 ctermbg=152 ctermfg=16
-	hi BGb22222 guibg=#B22222 guifg=#FFFFFF ctermbg=124 ctermfg=231
-	hi BGb8860b guibg=#B8860B guifg=#000000 ctermbg=3   ctermfg=16
-	hi BGba55d3 guibg=#BA55D3 guifg=#000000 ctermbg=5   ctermfg=16
-	hi BGbc8f8f guibg=#BC8F8F guifg=#000000 ctermbg=138 ctermfg=16
-	hi BGbdb76b guibg=#BDB76B guifg=#000000 ctermbg=247 ctermfg=16
-	hi BGc0c0c0 guibg=#C0C0C0 guifg=#000000 ctermbg=250 ctermfg=16
-	hi BGc71585 guibg=#C71585 guifg=#FFFFFF ctermbg=5   ctermfg=231
-	hi BGcd5c5c guibg=#CD5C5C guifg=#000000 ctermbg=167 ctermfg=16
-	hi BGcd853f guibg=#CD853F guifg=#000000 ctermbg=173 ctermfg=16
-	hi BGd2691e guibg=#D2691E guifg=#000000 ctermbg=166 ctermfg=16
-	hi BGd2b48c guibg=#D2B48C guifg=#000000 ctermbg=180 ctermfg=16
-	hi BGd3d3d3 guibg=#D3D3D3 guifg=#000000 ctermbg=252 ctermfg=16
-	hi BGd87093 guibg=#D87093 guifg=#000000 ctermbg=168 ctermfg=16
-	hi BGd8bfd8 guibg=#D8BFD8 guifg=#000000 ctermbg=252 ctermfg=16
-	hi BGda70d6 guibg=#DA70D6 guifg=#000000 ctermbg=249 ctermfg=16
-	hi BGdaa520 guibg=#DAA520 guifg=#000000 ctermbg=3   ctermfg=16
-	hi BGdc143c guibg=#DC143C guifg=#FFFFFF ctermbg=161 ctermfg=231
-	hi BGdcdcdc guibg=#DCDCDC guifg=#000000 ctermbg=253 ctermfg=16
-	hi BGdda0dd guibg=#DDA0DD guifg=#000000 ctermbg=182 ctermfg=16
-	hi BGdeb887 guibg=#DEB887 guifg=#000000 ctermbg=180 ctermfg=16
-	hi BGe0ffff guibg=#E0FFFF guifg=#000000 ctermbg=195 ctermfg=16
-	hi BGe6e6fa guibg=#E6E6FA guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGe9967a guibg=#E9967A guifg=#000000 ctermbg=174 ctermfg=16
-	hi BGee82ee guibg=#EE82EE guifg=#000000 ctermbg=251 ctermfg=16
-	hi BGeee8aa guibg=#EEE8AA guifg=#000000 ctermbg=223 ctermfg=16
-	hi BGf08080 guibg=#F08080 guifg=#000000 ctermbg=210 ctermfg=16
-	hi BGf0e68c guibg=#F0E68C guifg=#000000 ctermbg=222 ctermfg=16
-	hi BGf0f8ff guibg=#F0F8FF guifg=#000000 ctermbg=15  ctermfg=16
-	hi BGf0fff0 guibg=#F0FFF0 guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGf0ffff guibg=#F0FFFF guifg=#000000 ctermbg=15  ctermfg=16
-	hi BGf4a460 guibg=#F4A460 guifg=#000000 ctermbg=215 ctermfg=16
-	hi BGf5deb3 guibg=#F5DEB3 guifg=#000000 ctermbg=223 ctermfg=16
-	hi BGf5f5dc guibg=#F5F5DC guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGf5f5f5 guibg=#F5F5F5 guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGf5fffa guibg=#F5FFFA guifg=#000000 ctermbg=15  ctermfg=16
-	hi BGf8f8ff guibg=#F8F8FF guifg=#000000 ctermbg=15  ctermfg=16
-	hi BGfa8072 guibg=#FA8072 guifg=#000000 ctermbg=209 ctermfg=16
-	hi BGfaebd7 guibg=#FAEBD7 guifg=#000000 ctermbg=7   ctermfg=16
-	hi BGfaf0e6 guibg=#FAF0E6 guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGfafad2 guibg=#FAFAD2 guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGfdf5e6 guibg=#FDF5E6 guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGff0000 guibg=#FF0000 guifg=#FFFFFF ctermbg=196 ctermfg=231
-	hi BGff00ff guibg=#FF00FF guifg=#FFFFFF ctermbg=13  ctermfg=231
-	hi BGff1493 guibg=#FF1493 guifg=#FFFFFF ctermbg=5   ctermfg=231
-	hi BGff4500 guibg=#FF4500 guifg=#FFFFFF ctermbg=9   ctermfg=231
-	hi BGff6347 guibg=#FF6347 guifg=#000000 ctermbg=203 ctermfg=16
-	hi BGff69b4 guibg=#FF69B4 guifg=#000000 ctermbg=205 ctermfg=16
-	hi BGff7f50 guibg=#FF7F50 guifg=#000000 ctermbg=209 ctermfg=16
-	hi BGff8c00 guibg=#FF8C00 guifg=#000000 ctermbg=3   ctermfg=16
-	hi BGffa07a guibg=#FFA07A guifg=#000000 ctermbg=216 ctermfg=16
-	hi BGffa500 guibg=#FFA500 guifg=#000000 ctermbg=3   ctermfg=16
-	hi BGffb6c1 guibg=#FFB6C1 guifg=#000000 ctermbg=217 ctermfg=16
-	hi BGffc0cb guibg=#FFC0CB guifg=#000000 ctermbg=218 ctermfg=16
-	hi BGffd700 guibg=#FFD700 guifg=#000000 ctermbg=11  ctermfg=16
-	hi BGffdab9 guibg=#FFDAB9 guifg=#000000 ctermbg=223 ctermfg=16
-	hi BGffdead guibg=#FFDEAD guifg=#000000 ctermbg=223 ctermfg=16
-	hi BGffe4b5 guibg=#FFE4B5 guifg=#000000 ctermbg=223 ctermfg=16
-	hi BGffe4c4 guibg=#FFE4C4 guifg=#000000 ctermbg=224 ctermfg=16
-	hi BGffe4e1 guibg=#FFE4E1 guifg=#000000 ctermbg=224 ctermfg=16
-	hi BGffebcd guibg=#FFEBCD guifg=#000000 ctermbg=7   ctermfg=16
-	hi BGffefd5 guibg=#FFEFD5 guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGfff0f5 guibg=#FFF0F5 guifg=#000000 ctermbg=15  ctermfg=16
-	hi BGfff5ee guibg=#FFF5EE guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGfff8dc guibg=#FFF8DC guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGfffacd guibg=#FFFACD guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGfffaf0 guibg=#FFFAF0 guifg=#000000 ctermbg=15  ctermfg=16
-	hi BGfffafa guibg=#FFFAFA guifg=#000000 ctermbg=15  ctermfg=16
-	hi BGffff00 guibg=#FFFF00 guifg=#000000 ctermbg=11  ctermfg=16
-	hi BGffffe0 guibg=#FFFFE0 guifg=#000000 ctermbg=255 ctermfg=16
-	hi BGfffff0 guibg=#FFFFF0 guifg=#000000 ctermbg=15  ctermfg=16
-	hi BGffffff guibg=#FFFFFF guifg=#000000 ctermbg=231 ctermfg=16
-
-	" W3C Colors
-	syn keyword BG000000 black   contained containedin=@colorableGroup
-	syn keyword BGc0c0c0 silver  contained containedin=@colorableGroup
-	syn keyword BG808080 gray    contained containedin=@colorableGroup
-	syn match BGffffff "\<white\(-\)\@!\>" contained containedin=@colorableGroup
-	syn keyword BG800000 maroon  contained containedin=@colorableGroup
-	syn keyword BGff0000 red     contained containedin=@colorableGroup
-	syn keyword BG800080 purple  contained containedin=@colorableGroup
-	syn keyword BGff00ff fuchsia contained containedin=@colorableGroup
-	syn keyword BG008000 green   contained containedin=@colorableGroup
-	syn keyword BG00ff00 lime    contained containedin=@colorableGroup
-	syn keyword BG808000 olive   contained containedin=@colorableGroup
-	syn keyword BGffff00 yellow  contained containedin=@colorableGroup
-	syn keyword BG000080 navy    contained containedin=@colorableGroup
-	syn keyword BG0000ff blue    contained containedin=@colorableGroup
-	syn keyword BG008080 teal    contained containedin=@colorableGroup
-	syn keyword BG00ffff aqua    contained containedin=@colorableGroup
-
-	" extra colors
-	syn keyword BGf0f8ff AliceBlue            contained containedin=@colorableGroup
-	syn keyword BGfaebd7 AntiqueWhite         contained containedin=@colorableGroup
-	syn keyword BG7fffd4 Aquamarine           contained containedin=@colorableGroup
-	syn keyword BGf0ffff Azure                contained containedin=@colorableGroup
-	syn keyword BGf5f5dc Beige                contained containedin=@colorableGroup
-	syn keyword BGffe4c4 Bisque               contained containedin=@colorableGroup
-	syn keyword BGffebcd BlanchedAlmond       contained containedin=@colorableGroup
-	syn keyword BG8a2be2 BlueViolet           contained containedin=@colorableGroup
-	syn keyword BGa52a2a Brown                contained containedin=@colorableGroup
-	syn keyword BGdeb887 BurlyWood            contained containedin=@colorableGroup
-	syn keyword BG5f9ea0 CadetBlue            contained containedin=@colorableGroup
-	syn keyword BG7fff00 Chartreuse           contained containedin=@colorableGroup
-	syn keyword BGd2691e Chocolate            contained containedin=@colorableGroup
-	syn keyword BGff7f50 Coral                contained containedin=@colorableGroup
-	syn keyword BG6495ed CornflowerBlue       contained containedin=@colorableGroup
-	syn keyword BGfff8dc Cornsilk             contained containedin=@colorableGroup
-	syn keyword BGdc143c Crimson              contained containedin=@colorableGroup
-	syn keyword BG00ffff Cyan                 contained containedin=@colorableGroup
-	syn keyword BG00008b DarkBlue             contained containedin=@colorableGroup
-	syn keyword BG008b8b DarkCyan             contained containedin=@colorableGroup
-	syn keyword BGb8860b DarkGoldenRod        contained containedin=@colorableGroup
-	syn keyword BGa9a9a9 DarkGray             contained containedin=@colorableGroup
-	syn keyword BG006400 DarkGreen            contained containedin=@colorableGroup
-	syn keyword BGa9a9a9 DarkGrey             contained containedin=@colorableGroup
-	syn keyword BGbdb76b DarkKhaki            contained containedin=@colorableGroup
-	syn keyword BG8b008b DarkMagenta          contained containedin=@colorableGroup
-	syn keyword BG556b2f DarkOliveGreen       contained containedin=@colorableGroup
-	syn keyword BG9932cc DarkOrchid           contained containedin=@colorableGroup
-	syn keyword BG8b0000 DarkRed              contained containedin=@colorableGroup
-	syn keyword BGe9967a DarkSalmon           contained containedin=@colorableGroup
-	syn keyword BG8fbc8f DarkSeaGreen         contained containedin=@colorableGroup
-	syn keyword BG483d8b DarkSlateBlue        contained containedin=@colorableGroup
-	syn keyword BG2f4f4f DarkSlateGray        contained containedin=@colorableGroup
-	syn keyword BG2f4f4f DarkSlateGrey        contained containedin=@colorableGroup
-	syn keyword BG00ced1 DarkTurquoise        contained containedin=@colorableGroup
-	syn keyword BG9400d3 DarkViolet           contained containedin=@colorableGroup
-	syn keyword BGff8c00 Darkorange           contained containedin=@colorableGroup
-	syn keyword BGff1493 DeepPink             contained containedin=@colorableGroup
-	syn keyword BG00bfff DeepSkyBlue          contained containedin=@colorableGroup
-	syn keyword BG696969 DimGray              contained containedin=@colorableGroup
-	syn keyword BG696969 DimGrey              contained containedin=@colorableGroup
-	syn keyword BG1e90ff DodgerBlue           contained containedin=@colorableGroup
-	syn keyword BGb22222 FireBrick            contained containedin=@colorableGroup
-	syn keyword BGfffaf0 FloralWhite          contained containedin=@colorableGroup
-	syn keyword BG228b22 ForestGreen          contained containedin=@colorableGroup
-	syn keyword BGdcdcdc Gainsboro            contained containedin=@colorableGroup
-	syn keyword BGf8f8ff GhostWhite           contained containedin=@colorableGroup
-	syn keyword BGffd700 Gold                 contained containedin=@colorableGroup
-	syn keyword BGdaa520 GoldenRod            contained containedin=@colorableGroup
-	syn keyword BGadff2f GreenYellow          contained containedin=@colorableGroup
-	syn keyword BG808080 Grey                 contained containedin=@colorableGroup
-	syn keyword BGf0fff0 HoneyDew             contained containedin=@colorableGroup
-	syn keyword BGff69b4 HotPink              contained containedin=@colorableGroup
-	syn keyword BGcd5c5c IndianRed            contained containedin=@colorableGroup
-	syn keyword BG4b0082 Indigo               contained containedin=@colorableGroup
-	syn keyword BGfffff0 Ivory                contained containedin=@colorableGroup
-	syn keyword BGf0e68c Khaki                contained containedin=@colorableGroup
-	syn keyword BGe6e6fa Lavender             contained containedin=@colorableGroup
-	syn keyword BGfff0f5 LavenderBlush        contained containedin=@colorableGroup
-	syn keyword BG7cfc00 LawnGreen            contained containedin=@colorableGroup
-	syn keyword BGfffacd LemonChiffon         contained containedin=@colorableGroup
-	syn keyword BGadd8e6 LightBlue            contained containedin=@colorableGroup
-	syn keyword BGf08080 LightCoral           contained containedin=@colorableGroup
-	syn keyword BGe0ffff LightCyan            contained containedin=@colorableGroup
-	syn keyword BGfafad2 LightGoldenRodYellow contained containedin=@colorableGroup
-	syn keyword BGd3d3d3 LightGray            contained containedin=@colorableGroup
-	syn keyword BG90ee90 LightGreen           contained containedin=@colorableGroup
-	syn keyword BGd3d3d3 LightGrey            contained containedin=@colorableGroup
-	syn keyword BGffb6c1 LightPink            contained containedin=@colorableGroup
-	syn keyword BGffa07a LightSalmon          contained containedin=@colorableGroup
-	syn keyword BG20b2aa LightSeaGreen        contained containedin=@colorableGroup
-	syn keyword BG87cefa LightSkyBlue         contained containedin=@colorableGroup
-	syn keyword BG778899 LightSlateGray       contained containedin=@colorableGroup
-	syn keyword BG778899 LightSlateGrey       contained containedin=@colorableGroup
-	syn keyword BGb0c4de LightSteelBlue       contained containedin=@colorableGroup
-	syn keyword BGffffe0 LightYellow          contained containedin=@colorableGroup
-	syn keyword BG32cd32 LimeGreen            contained containedin=@colorableGroup
-	syn keyword BGfaf0e6 Linen                contained containedin=@colorableGroup
-	syn keyword BGff00ff Magenta              contained containedin=@colorableGroup
-	syn keyword BG66cdaa MediumAquaMarine     contained containedin=@colorableGroup
-	syn keyword BG0000cd MediumBlue           contained containedin=@colorableGroup
-	syn keyword BGba55d3 MediumOrchid         contained containedin=@colorableGroup
-	syn keyword BG9370d8 MediumPurple         contained containedin=@colorableGroup
-	syn keyword BG3cb371 MediumSeaGreen       contained containedin=@colorableGroup
-	syn keyword BG7b68ee MediumSlateBlue      contained containedin=@colorableGroup
-	syn keyword BG00fa9a MediumSpringGreen    contained containedin=@colorableGroup
-	syn keyword BG48d1cc MediumTurquoise      contained containedin=@colorableGroup
-	syn keyword BGc71585 MediumVioletRed      contained containedin=@colorableGroup
-	syn keyword BG191970 MidnightBlue         contained containedin=@colorableGroup
-	syn keyword BGf5fffa MintCream            contained containedin=@colorableGroup
-	syn keyword BGffe4e1 MistyRose            contained containedin=@colorableGroup
-	syn keyword BGffe4b5 Moccasin             contained containedin=@colorableGroup
-	syn keyword BGffdead NavajoWhite          contained containedin=@colorableGroup
-	syn keyword BGfdf5e6 OldLace              contained containedin=@colorableGroup
-	syn keyword BG6b8e23 OliveDrab            contained containedin=@colorableGroup
-	syn keyword BGffa500 Orange               contained containedin=@colorableGroup
-	syn keyword BGff4500 OrangeRed            contained containedin=@colorableGroup
-	syn keyword BGda70d6 Orchid               contained containedin=@colorableGroup
-	syn keyword BGeee8aa PaleGoldenRod        contained containedin=@colorableGroup
-	syn keyword BG98fb98 PaleGreen            contained containedin=@colorableGroup
-	syn keyword BGafeeee PaleTurquoise        contained containedin=@colorableGroup
-	syn keyword BGd87093 PaleVioletRed        contained containedin=@colorableGroup
-	syn keyword BGffefd5 PapayaWhip           contained containedin=@colorableGroup
-	syn keyword BGffdab9 PeachPuff            contained containedin=@colorableGroup
-	syn keyword BGcd853f Peru                 contained containedin=@colorableGroup
-	syn keyword BGffc0cb Pink                 contained containedin=@colorableGroup
-	syn keyword BGdda0dd Plum                 contained containedin=@colorableGroup
-	syn keyword BGb0e0e6 PowderBlue           contained containedin=@colorableGroup
-	syn keyword BGbc8f8f RosyBrown            contained containedin=@colorableGroup
-	syn keyword BG4169e1 RoyalBlue            contained containedin=@colorableGroup
-	syn keyword BG8b4513 SaddleBrown          contained containedin=@colorableGroup
-	syn keyword BGfa8072 Salmon               contained containedin=@colorableGroup
-	syn keyword BGf4a460 SandyBrown           contained containedin=@colorableGroup
-	syn keyword BG2e8b57 SeaGreen             contained containedin=@colorableGroup
-	syn keyword BGfff5ee SeaShell             contained containedin=@colorableGroup
-	syn keyword BGa0522d Sienna               contained containedin=@colorableGroup
-	syn keyword BG87ceeb SkyBlue              contained containedin=@colorableGroup
-	syn keyword BG6a5acd SlateBlue            contained containedin=@colorableGroup
-	syn keyword BG708090 SlateGray            contained containedin=@colorableGroup
-	syn keyword BG708090 SlateGrey            contained containedin=@colorableGroup
-	syn keyword BGfffafa Snow                 contained containedin=@colorableGroup
-	syn keyword BG00ff7f SpringGreen          contained containedin=@colorableGroup
-	syn keyword BG4682b4 SteelBlue            contained containedin=@colorableGroup
-	syn keyword BGd2b48c Tan                  contained containedin=@colorableGroup
-	syn keyword BGd8bfd8 Thistle              contained containedin=@colorableGroup
-	syn keyword BGff6347 Tomato               contained containedin=@colorableGroup
-	syn keyword BG40e0d0 Turquoise            contained containedin=@colorableGroup
-	syn keyword BGee82ee Violet               contained containedin=@colorableGroup
-	syn keyword BGf5deb3 Wheat                contained containedin=@colorableGroup
-	syn keyword BGf5f5f5 WhiteSmoke           contained containedin=@colorableGroup
-	syn keyword BG9acd32 YellowGreen          contained containedin=@colorableGroup
-endfunction

autoload/erlangcomplete.vim

@@ -1,161 +0,0 @@
-" ------------------------------------------------------------------------------
-" Vim omni-completion script
-" Author: Oscar Hellström
-" Email: oscar@oscarh.net
-" Version: 2010-08-10
-" Contributors: kTT (http://github.com/kTT)
-" 		Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
-" ------------------------------------------------------------------------------
-
-" Patterns for completions {{{1
-let s:erlangLocalFuncBeg    = '\(\<[0-9A-Za-z_-]*\|\s*\)$'
-let s:erlangExternalFuncBeg = '\<[0-9A-Za-z_-]\+:[0-9A-Za-z_-]*$'
-let s:ErlangBlankLine       = '^\s*\(%.*\)\?$'
-let s:erlangCompletionPath  = expand('<sfile>:p:h') . '/erlang_completion.erl'
-
-if !exists('g:erlangCompletionGrep')
-	let g:erlangCompletionGrep = 'grep'
-endif
-
-if !exists('g:erlangManSuffix')
-	let g:erlangManSuffix = ''
-endif
-
-if !exists('g:erlangManPath')
-	let g:erlangManPath = '/usr/lib/erlang/man'
-endif
-
-if !exists('g:erlangCompletionDisplayDoc')
-	let g:erlangCompletionDisplayDoc = 1
-endif
-
-" Main function for completion {{{1
-function! erlangcomplete#Complete(findstart, base)
-	" 0) Init {{{2
-	let lnum = line('.')
-	let column = col('.') 
-	let line = strpart(getline('.'), 0, column - 1)
-
-	" 1) First, check if completion is impossible {{{2
-	if line =~ '[^~\\]%'
-		return -1
-	endif
-
-	"echo "line[col - 1]:" . line[column - 1] . " line[col - 2]:" . line[column - 2] .  "\n" . line . "\n"
-
-	" 2) Check if the char to the left of us are part of a function call {{{2
-	"
-	" Nothing interesting is written at the char just before the cursor
-	" This means _anything_ could be started here
-	" In this case, keyword completion should probably be used,
-	" for now we'll only try and complete local functions.
-	" TODO: Examine if we can stare Identifiers end complete on them
-	" Is this worth it? Is /completion/ of a "blank" wanted? Can we consider (
-	" interesting and check if we are in a function call etc.?
-	if line[column - 2] !~ '[0-9A-Za-z:_-]'
-		if a:findstart
-			return column
-		else
-			return s:erlangFindLocalFunc(a:base)
-		endif
-	endif
-	
-
-	" 3) Function in external module {{{2
-	if line =~ s:erlangExternalFuncBeg
-		let delimiter = match(line, ':[0-9A-Za-z_-]*$') + 1
-		if a:findstart
-			return delimiter
-		else
-                        let module = matchstr(line[:-2], '\<\k*\>$')
-			return s:erlangFindExternalFunc(module, a:base)
-		endif
-	endif
-
-	" 4) Local function {{{2
-	if line =~ s:erlangLocalFuncBeg
-		let funcstart = match(line, ':\@<![0-9A-Za-z_-]*$')
-		if a:findstart
-			return funcstart
-		else
-			return s:erlangFindLocalFunc(a:base)
-		endif
-	endif
-
-	" 5) Unhandled situation {{{2
-	if a:findstart
-		return -1
-	else
-		return []
-	endif
-endfunction
-
-" Auxiliary functions for completion {{{1 
-" Find the next non-blank line {{{2
-function s:erlangFindNextNonBlank(lnum)
-	let lnum = nextnonblank(a:lnum + 1)
-	let line = getline(lnum)
-	while line =~ s:ErlangBlankLine && 0 != lnum
-		let lnum = nextnonblank(lnum + 1)
-		let line = getline(lnum)
-   endwhile
-   return lnum
-endfunction
-			
-" vim: foldmethod=marker:
-" Find external function names {{{2
-function s:erlangFindExternalFunc(module, base)
-        " If it's a local module, try to compile it
-        if filereadable(a:module . '.erl') && !filereadable(a:module . '.beam')
-            silent execute '!erlc' a:module . '.erl' '>/dev/null' '2>/dev/null'
-            redraw!
-        endif
-        let functions = system(s:erlangCompletionPath . ' ' . a:module)
-        for element in sort(split(functions, '\n'))
-            if match(element, a:base) == 0
-                let function_name = matchstr(element, a:base . '\w\+')
-                let number_of_args = matchstr(element, '\d\+', len(function_name))
-                let number_of_comma = max([number_of_args - 1, 0])
-                let file_path = g:erlangManPath . '/man?/' . a:module . '\.?' . g:erlangManSuffix
-                " [:-2] cutting some weird characters at the end
-                " becouse grep doesn't support multilines, we have to filter
-                " first by .B and next by looking via function name
-                " if someone have better idea, please change it
-                let description = ''
-                " Don't look man pages if the module is present in the current directory
-                if g:erlangCompletionDisplayDoc != 0 && !filereadable(a:module . '.erl')
-                    let system_command = g:erlangCompletionGrep . ' -A 1 "\.B" ' . file_path . ' | grep -EZo "\<' .
-\                           function_name . '\>\((\w+, ){' . number_of_comma . '}[^),]*\) -> .*"'
-                    let description = system(system_command)
-                    let description = description[:-2]
-                endif
-                if description == ''
-                    let description = element " if function doesn't have description e.g. lists:rmerge, put rmerge/2 instead
-                endif
-                let field = {'word': function_name . '(', 'abbr': description, 'kind': 'f', 'dup': 1} " always duplicate functions
-                call complete_add(field)
-            endif
-        endfor
-        return []
-endfunction
-
-" Find local function names {{{2
-function s:erlangFindLocalFunc(base)
-	" begin at line 1
-	let lnum = s:erlangFindNextNonBlank(1)
-	if "" == a:base
-		let base = '\w' " used to match against word symbol
-	else
-		let base = a:base
-	endif
-	while 0 != lnum && !complete_check()
-		let line = getline(lnum)
-		let function_name = matchstr(line, '^' . base . '[0-9A-Za-z_-]\+(\@=')
-		if function_name != ""
-			call complete_add(function_name)
-		endif
-		let lnum = s:erlangFindNextNonBlank(lnum)
-	endwhile
-	return []
-endfunction
-

autoload/go/complete.vim

@@ -1,103 +0,0 @@
-" 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.
-"
-" This file provides a utility function that performs auto-completion of
-" package names, for use by other commands.
-
-let s:goos = $GOOS
-let s:goarch = $GOARCH
-
-if len(s:goos) == 0
-  if exists('g:golang_goos')
-    let s:goos = g:golang_goos
-  elseif has('win32') || has('win64')
-    let s:goos = 'windows'
-  elseif has('macunix')
-    let s:goos = 'darwin'
-  else
-    let s:goos = '*'
-  endif
-endif
-
-if len(s:goarch) == 0
-  if exists('g:golang_goarch')
-    let s:goarch = g:golang_goarch
-  else
-    let s:goarch = '*'
-  endif
-endif
-
-function! go#complete#PackageMembers(package, member)
-  silent! let content = system('godoc ' . a:package)
-  if v:shell_error || !len(content)
-    return []
-  endif
-  let lines = filter(split(content, "\n"),"v:val !~ '^\\s\\+$'")
-  try
-    let mx1 = '^\s\+\(\S+\)\s\+=\s\+.*'
-    let mx2 = '^\%(const\|var\|type\|func\) \([A-Z][^ (]\+\).*'
-    let candidates =
-    \   map(filter(copy(lines), 'v:val =~ mx1'), 'substitute(v:val, mx1, "\\1", "")')
-    \ + map(filter(copy(lines), 'v:val =~ mx2'), 'substitute(v:val, mx2, "\\1", "")')
-    return filter(candidates, '!stridx(v:val, a:member)')
-  catch
-    return []
-  endtry
-endfunction
-
-function! go#complete#Package(ArgLead, CmdLine, CursorPos)
-  let dirs = []
-
-  let words = split(a:CmdLine, '\s\+', 1)
-  if len(words) > 2
-    " Complete package members
-    return go#complete#PackageMembers(words[1], words[2])
-  endif
-
-  if executable('go')
-    let goroot = substitute(system('go env GOROOT'), '\n', '', 'g')
-    if v:shell_error
-      echomsg '''go env GOROOT'' failed'
-    endif
-  else
-    let goroot = $GOROOT
-  endif
-
-  if len(goroot) != 0 && isdirectory(goroot)
-    let dirs += [goroot]
-  endif
-
-  let pathsep = ':'
-  if s:goos == 'windows'
-    let pathsep = ';'
-  endif
-  let workspaces = split($GOPATH, pathsep)
-  if workspaces != []
-    let dirs += workspaces
-  endif
-
-  if len(dirs) == 0
-    " should not happen
-    return []
-  endif
-
-  let ret = {}
-  for dir in dirs
-    " this may expand to multiple lines
-    let root = split(expand(dir . '/pkg/' . s:goos . '_' . s:goarch), "\n")
-    call add(root, expand(dir . '/src'))
-    for r in root
-      for i in split(globpath(r, a:ArgLead.'*'), "\n")
-        if isdirectory(i)
-          let i .= '/'
-        elseif i !~ '\.a$'
-          continue
-        endif
-        let i = substitute(substitute(i[len(r)+1:], '[\\]', '/', 'g'), '\.a$', '', 'g')
-        let ret[i] = i
-      endfor
-    endfor
-  endfor
-  return sort(keys(ret))
-endfunction

autoload/htmlcomplete.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+  
 " Vim completion script
 " Language:	HTML and XHTML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
@@ -837,3 +839,5 @@ function! htmlcomplete#CheckDoctype() " {{{
 endfunction
 " }}}
 " vim:set foldmethod=marker:
+
+endif

autoload/rubycomplete.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+  
 " Vim completion script
 " Language:             Ruby
 " Maintainer:           Mark Guzman <segfault@hasno.info>
@@ -704,7 +706,9 @@ class VimRubyCompletion
         cv = eval("self.class.constants")
         vartype = get_var_type( receiver )
         dprint "vartype: %s" % vartype
-        if vartype != ''
+
+        invalid_vartype = ['', "gets"]
+        if !invalid_vartype.include?(vartype)
           load_buffer_class( vartype )
 
           begin
@@ -732,7 +736,7 @@ class VimRubyCompletion
             methods.concat m.instance_methods(false)
           }
         end
-        variables += add_rails_columns( "#{vartype}" ) if vartype && vartype.length > 0
+        variables += add_rails_columns( "#{vartype}" ) if vartype && !invalid_vartype.include?(vartype)
 
       when /^\(?\s*[A-Za-z0-9:^@.%\/+*\(\)]+\.\.\.?[A-Za-z0-9:^@.%\/+*\(\)]+\s*\)?\.([^.]*)/
         message = $1
@@ -829,3 +833,5 @@ call s:DefRuby()
 
 
 " vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:
+
+endif

autoload/rust.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+  
 " Author: Kevin Ballard
 " Description: Helper functions for Rust commands/mappings
 " Last Modified: May 27, 2014
@@ -178,14 +180,14 @@ function! s:WithPath(func, ...)
 			call mkdir(tmpdir)
 
 			let save_cwd = getcwd()
-			silent exe 'lcd' tmpdir
+			silent exe 'lcd' fnameescape(tmpdir)
 
 			let path = 'unnamed.rs'
 
 			let save_mod = &mod
 			set nomod
 
-			silent exe 'keepalt write! ' . path
+			silent exe 'keepalt write! ' . fnameescape(path)
 			if pathisempty
 				silent keepalt 0file
 			endif
@@ -195,10 +197,10 @@ function! s:WithPath(func, ...)
 
 		call call(a:func, [path] + a:000)
 	finally
-		if exists("save_mod")   | let &mod = save_mod          | endif
+		if exists("save_mod")   | let &mod = save_mod                    | endif
-		if exists("save_write") | let &write = save_write      | endif
+		if exists("save_write") | let &write = save_write                | endif
-		if exists("save_cwd")   | silent exe 'lcd' save_cwd    | endif
+		if exists("save_cwd")   | silent exe 'lcd' fnameescape(save_cwd) | endif
-		if exists("tmpdir")     | silent call s:RmDir(tmpdir)  | endif
+		if exists("tmpdir")     | silent call s:RmDir(tmpdir)            | endif
 	endtry
 endfunction
 
@@ -223,3 +225,5 @@ endfunction
 " }}}1
 
 " vim: set noet sw=4 ts=4:
+
+endif

autoload/xml/aria.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+  
 " Vim completion for WAI-ARIA data file
 " Language:       HTML + WAI-ARIA
 " Maintainer:     othree <othree@gmail.com>
@@ -230,3 +232,5 @@ let g:xmldata_aria = {
     \ 'default_role': default_role,
     \ 'vimariaattrinfo': aria_attributes_value
 \ }
+
+endif

autoload/xml/html5.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+  
 " Vim completion for HTML5 data file
 " Language:       HTML5
 " Maintainer:     othree <othree@gmail.com>
@@ -324,7 +326,7 @@ endif
 
 " Ref: http://dev.w3.org/html5/markup/
 " Version: Draft 05 April 2011
-let phrasing_elements = ['a', 'em', 'strong', 'small', 'mark', 'abbr', 'dfn', 'i', 'b', 'u', 'code', 'var', 'samp', 'kbd', 'sup', 'sub', 'q', 'cite', 'span', 'bdo', 'bdi', 'br', 'wbr', 'ins', 'del', 'img', 'embed', 'object', 'iframe', 'map', 'area', 'script', 'noscript', 'ruby', 'video', 'audio', 'input', 'textarea', 'select', 'button', 'label', 'output', 'datalist', 'keygen', 'progress', 'command', 'canvas', 'time', 'meter', 'data', 'content', 'shadow']
+let phrasing_elements = ['a', 'em', 'strong', 'small', 'mark', 'abbr', 'dfn', 'i', 'b', 'u', 'code', 'var', 'samp', 'kbd', 'sup', 'sub', 'q', 'cite', 'span', 'bdo', 'bdi', 'br', 'wbr', 'ins', 'del', 'img', 'picture', 'embed', 'object', 'iframe', 'map', 'area', 'script', 'noscript', 'ruby', 'video', 'audio', 'input', 'textarea', 'select', 'button', 'label', 'output', 'datalist', 'keygen', 'progress', 'command', 'canvas', 'time', 'meter', 'data', 'content', 'shadow']
 
 let metadata_elements = ['link', 'style', 'meta', 'script', 'noscript', 'command']
 
@@ -545,7 +547,7 @@ let g:xmldata_html5 = {
 \ ],
 \ 'iframe': [
     \ [],
-    \ extend(copy(global_attributes), {'src': [], 'name': [], 'width': [], 'height': [], 'sandbox': ['allow-same-origin', 'allow-forms', 'allow-scripts'], 'seamless': ['seamless', '']})
+    \ extend(copy(global_attributes), {'src': [], 'srcdoc': [], 'name': [], 'width': [], 'height': [], 'sandbox': ['allow-same-origin', 'allow-forms', 'allow-scripts'], 'seamless': ['seamless', '']})
 \ ],
 \ 'img': [
     \ [],
@@ -601,7 +603,7 @@ let g:xmldata_html5 = {
 \ ],
 \ 'meta': [
     \ [],
-    \ extend(copy(global_attributes), {'name': [], 'http-equiv': ['refresh', 'default-style', 'content-type'], 'content': [], 'charset': charset})
+    \ extend(copy(global_attributes), {'name': ['application-name', 'author', 'description', 'generator', 'referrer', 'creator', 'googlebot', 'publisher', 'robots', 'slurp', 'viewport', 'theme-color'], 'http-equiv': ['refresh', 'default-style', 'content-type'], 'content': [], 'charset': charset})
 \ ],
 \ 'meter': [
     \ phrasing_elements,
@@ -643,6 +645,10 @@ let g:xmldata_html5 = {
     \ [],
     \ extend(copy(global_attributes), {'name': [], 'value': []})
 \ ],
+\ 'picture': [
+    \ flow_elements + ['source'],
+    \ global_attributes
+\ ],
 \ 'pre': [
     \ phrasing_elements,
     \ global_attributes
@@ -655,6 +661,10 @@ let g:xmldata_html5 = {
     \ phrasing_elements,
     \ extend(copy(global_attributes), {'cite': []})
 \ ],
+\ 'rb': [
+    \ phrasing_elements,
+    \ global_attributes
+\ ],
 \ 'rp': [
     \ phrasing_elements,
     \ global_attributes
@@ -663,10 +673,14 @@ let g:xmldata_html5 = {
     \ phrasing_elements,
     \ global_attributes
 \ ],
-\ 'ruby': [
+\ 'rtc': [
     \ phrasing_elements + ['rp', 'rt'],
     \ global_attributes
 \ ],
+\ 'ruby': [
+    \ phrasing_elements + ['rb', 'rp', 'rt', 'rtc'],
+    \ global_attributes
+\ ],
 \ 'samp': [
     \ phrasing_elements,
     \ global_attributes
@@ -693,7 +707,7 @@ let g:xmldata_html5 = {
 \ ],
 \ 'source': [
     \ [],
-    \ extend(copy(global_attributes), {'src': [], 'type': [], 'media': []})
+    \ extend(copy(global_attributes), {'src': [], 'type': [], 'media': [], 'srcset': [], 'sizes': []})
 \ ],
 \ 'span': [
     \ phrasing_elements,
@@ -811,3 +825,5 @@ let g:xmldata_html5 = {
     \ 'wbr': ['/>', ''],
 \ },
 \ }
+
+endif

build

@@ -3,13 +3,22 @@
 set -E
 
 DIRS="syntax indent compiler autoload ftplugin ftdetect after/syntax after/indent after/ftplugin after/ftdetect"
+DIRS_BASIC="syntax indent ftdetect after/syntax after/indent after/ftdetect"
+DIRS_ALL="syntax indent compiler autoload ftplugin ftdetect after"
+
+OUTPUT=""
+
+output() {
+  OUTPUT="$OUTPUT$1"
+  printf -- "$1"
+}
 
 download() {
   for pack in $1; do
     path="$(printf "$pack" | cut -d ':' -f 2)"
     dir="tmp/$(printf "$path" | cut -d '/' -f 2)"
     rm -rf "$dir"
-    (git clone -q --recursive "https://github.com/$path.git" "$dir" && printf '.') &
+    (mkdir -p "$dir" && curl --silent -L https://codeload.github.com/$path/tar.gz/master | tar -zx -C "$dir" --strip 1 && printf '.') &
   done
 
   wait
@@ -21,30 +30,33 @@ extract() {
     name="$(printf "$pack" | cut -d ':' -f 1)"
     path="$(printf "$pack" | cut -d ':' -f 2)"
     dir="tmp/$(printf "$path" | cut -d '/' -f 2)"
-    printf -- "- [$name](https://github.com/$path) ("
+    directories="DIRS$(printf "$pack" | cut -d ':' -f 3)"
+    subtree="$(printf "$pack" | cut -d ':' -f 4)"
+    output "- [$name](https://github.com/$path) ("
 
     subdirs=""
-    for subdir in $DIRS; do
+    for subdir in ${!directories}; do
-      if [ -d "$dir/$subdir" ]; then
+      if [ -d "${dir}${subtree:-/}${subdir}" ]; then
         base="$(basename "$subdir")"
         if [[ "$subdirs" != *"$base"* ]]; then
           subdirs="$subdirs, $base"
         fi
 
-        copy_dir "$dir" "$subdir"
+        copy_dir "${dir}${subtree}" "$subdir" "$name"
       fi
     done
 
 
-    printf "${subdirs##, })\n"
+    output "${subdirs##, })\n"
   done
 
   for pack in $1; do
     name="$(printf "$pack" | cut -d ':' -f 1)"
     path="$(printf "$pack" | cut -d ':' -f 2)"
     dir="tmp/$(printf "$path" | cut -d '/' -f 2)"
+    subtree="$(printf "$pack" | cut -d ':' -f 4)"
 
-    if [ -d "$dir/plugin" ]; then
+    if [ -d "$dir${subtree:-/}plugin" ]; then
       printf "Possible error (plugin directory exists): $path\n"
     fi
   done
@@ -55,7 +67,9 @@ copy_dir() {
     file_path="$(dirname "${file##$1/}")"
     mkdir -p "$file_path"
     touch "$file_path/$(basename "$file")"
-    cat $file >> $file_path/$(basename "$file")
+
+    # Use comma instead of / to handle cases like c/c++
+    sed -e "s,%%PACK%%,$3," -e "/%%CONTENT%%/{r $file" -e "d;}" plugin_guard.vim.template >> $file_path/$(basename "$file")
   done
 }
 
@@ -65,31 +79,54 @@ concat_ftdetect() {
   mv tmp/polyglot.vim ftdetect/
 }
 
+update_readme() {
+  OLD_README="$(cat README.md)"
+
+  ed README.md <<- EOF
+/Language packs
++2kb
+/##
+'b,-2c
+$(printf -- "$OUTPUT")
+.
+w
+q
+EOF
+
+}
+
 PACKS="
   arduino:sudar/vim-arduino-syntax
+  blade:xsbeats/vim-blade
   c++11:octol/vim-cpp-enhanced-highlight
   c/c++:vim-jp/cpp-vim
-  c-extensions:kergoth/aftersyntaxc.vim
   clojure:guns/vim-clojure-static
   coffee-script:kchmck/vim-coffee-script
-  csv:chrisbra/csv.vim
+  cjsx:mtscout6/vim-cjsx
+  css:JulesWang/css.vim
   cucumber:tpope/vim-cucumber
   dockerfile:honza/dockerfile.vim
   elixir:elixir-lang/vim-elixir
   emberscript:heartsentwined/vim-ember-script
-  erlang:oscarh/vimerl
+  emblem:heartsentwined/vim-emblem
+  erlang:hcs42/vim-erlang-runtime
   git:tpope/vim-git
-  go:jnwhiteh/vim-golang
+  glsl:tikhomirov/vim-glsl
+  go:fatih/vim-go:_BASIC
+  groovy:vim-scripts/groovy.vim
   haml:tpope/vim-haml
   handlebars:mustache/vim-mustache-handlebars
-  haskell:travitch/hasksyn
+  haskell:raichoo/haskell-vim
   haxe:yaymukund/vim-haxe
   html5:othree/html5.vim
   jade:digitaltoad/vim-jade
   jasmine:glanotte/vim-jasmine
-  javascript:pangloss/vim-javascript
+  javascript:sheerun/yajs.vim
-  json:leshill/vim-json
+  julia:dcjones/julia-minimalist-vim
+  json:sheerun/vim-json
   jst:briancollins/vim-jst
+  jsx:mxw/vim-jsx:_ALL
+  kotlin:udalov/kotlin-vim
   latex:LaTeX-Box-Team/LaTeX-Box
   less:groenewege/vim-less
   liquid:tpope/vim-liquid
@@ -101,36 +138,43 @@ PACKS="
   perl:vim-perl/vim-perl
   php:StanAngeloff/php.vim
   puppet:rodjek/vim-puppet
+  powershell:Persistent13/vim-ps1
   protobuf:uarun/vim-protobuf
   python:mitsuhiko/vim-python-combined
   r-lang:vim-scripts/R.vim
+  ragel:jneen/ragel.vim
   rspec:sheerun/rspec.vim
   ruby:vim-ruby/vim-ruby
   rust:wting/rust.vim
   sbt:derekwyatt/vim-sbt
   scala:derekwyatt/vim-scala
   slim:slim-template/vim-slim
+  solidity:ethereum/vim-solidity
   stylus:wavded/vim-stylus
   systemd:kurayama/systemd-vim-syntax
+  swift:toyamarinyon/vim-swift
   textile:timcharper/textile.vim
-  tmux:acustodioo/vim-tmux
+  tmux:tejr/vim-tmux
   tomdoc:duwanis/tomdoc.vim
   typescript:leafgarland/typescript-vim
   vbnet:vim-scripts/vbnet.vim
+  thrift:solarnz/thrift.vim
   toml:cespare/vim-toml
   twig:beyondwords/vim-twig
   xls:vim-scripts/XSLT-syntax
   yard:sheerun/vim-yardoc
-  css-color:ap/vim-css-color
+  vala:tkztmk/vim-vala
+  vm:lepture/vim-velocity
 "
 
 rm -rf tmp
-rm -rf $DIRS
+rm -rf $DIRS_ALL
 mkdir tmp
 
 printf "Downloading packs..."
 download "$PACKS"
 extract "$PACKS"
 concat_ftdetect
+update_readme
 
 rm -rf tmp

compiler/cake.vim

@@ -1,5 +1,7 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
@@ -13,3 +15,5 @@ call coffee#CoffeeSetUpVariables()
 exec 'CompilerSet makeprg=' . escape(g:coffee_cake . ' ' .
 \                                    g:coffee_cake_options . ' $*', ' ')
 call coffee#CoffeeSetUpErrorFormat()
+
+endif

compiler/cargo.vim

@@ -0,0 +1,69 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+  
+" Vim compiler file
+" Compiler:         Cargo Compiler
+" Maintainer:       Damien Radtke <damienradtke@gmail.com>
+" Latest Revision:  2014 Sep 24
+
+if exists('current_compiler')
+  finish
+endif
+runtime compiler/rustc.vim
+let current_compiler = "cargo"
+
+if exists(':CompilerSet') != 2
+    command -nargs=* CompilerSet setlocal <args>
+endif
+
+if exists('g:cargo_makeprg_params')
+    execute 'CompilerSet makeprg=cargo\ '.escape(g:cargo_makeprg_params, ' \|"').'\ $*'
+else
+    CompilerSet makeprg=cargo\ $*
+endif
+
+" Allow a configurable global Cargo.toml name. This makes it easy to
+" support variations like 'cargo.toml'.
+let s:cargo_manifest_name = get(g:, 'cargo_manifest_name', 'Cargo.toml')
+
+function! s:is_absolute(path)
+    return a:path[0] == '/' || a:path =~ '[A-Z]\+:'
+endfunction
+
+let s:local_manifest = findfile(s:cargo_manifest_name, '.;')
+if s:local_manifest != ''
+    let s:local_manifest = fnamemodify(s:local_manifest, ':p:h').'/'
+    augroup cargo
+        au!
+        au QuickfixCmdPost make call s:FixPaths()
+    augroup END
+
+    " FixPaths() is run after Cargo, and is used to change the file paths
+    " to be relative to the current directory instead of Cargo.toml.
+    function! s:FixPaths()
+        let qflist = getqflist()
+        let manifest = s:local_manifest
+        for qf in qflist
+            if !qf.valid
+                let m = matchlist(qf.text, '(file://\(.*\))$')
+                if !empty(m)
+                    let manifest = m[1].'/'
+                    " Manually strip another slash if needed; usually just an
+                    " issue on Windows.
+                    if manifest =~ '^/[A-Z]\+:/'
+                        let manifest = manifest[1:]
+                    endif
+                endif
+                continue
+            endif
+            let filename = bufname(qf.bufnr)
+            if s:is_absolute(filename)
+                continue
+            endif
+            let qf.filename = simplify(manifest.filename)
+            call remove(qf, 'bufnr')
+        endfor
+        call setqflist(qflist, 'r')
+    endfunction
+endif
+
+endif

compiler/coffee.vim

@@ -1,5 +1,7 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
@@ -80,3 +82,5 @@ augroup CoffeeUpdateMakePrg
     autocmd BufWritePre,BufFilePost          call s:UpdateMakePrg()
   endif
 augroup END
+
+endif

compiler/cucumber.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
+  
 " Vim compiler file
 " Compiler:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -19,7 +21,7 @@ CompilerSet makeprg=cucumber
 
 CompilerSet errorformat=
       \%W%m\ (Cucumber::Undefined),
-      \%E%m\ (%.%#),
+      \%E%m\ (%\\S%#),
       \%Z%f:%l,
       \%Z%f:%l:%.%#
 
@@ -27,3 +29,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
+
+endif

compiler/erlang.vim

@@ -1,80 +0,0 @@
-" Erlang compiler file
-" Language:   Erlang
-" Maintainer: Pawel 'kTT' Salata <rockplayer.pl@gmail.com>
-" URL:        http://ktototaki.info
-
-if exists("current_compiler")
-    finish
-endif
-let current_compiler = "erlang"
-
-if exists(":CompilerSet") != 2
-    command -nargs=* CompilerSet setlocal <args>
-endif
-
-if !exists('g:erlangCheckFile')
-    let g:erlangCheckFile = "~/.vim/compiler/erlang_check_file.erl"
-endif
-
-if !exists('g:erlangHighlightErrors')
-    let g:erlangHighlightErrors = 0
-endif
-
-let b:error_list = {}
-let b:is_showing_msg = 0
-
-function! HighlightErlangErrors()
-    if match(getline(1), "#!.*escript") != -1
-        setlocal makeprg=escript\ -s\ %
-    else
-        execute "setlocal makeprg=" . g:erlangCheckFile . "\\ \%"
-    endif
-    silent make!
-    call s:clear_matches()
-    for error in getqflist()
-        let item = {}
-        let item['lnum'] = error.lnum
-        let item['msg'] = error.text
-        let b:error_list[error.lnum] = item
-        call matchadd('SpellBad', "\\%" . error.lnum . "l")
-    endfor
-    if len(getqflist())
-        redraw!
-    endif
-    call s:show_msg()
-    setlocal makeprg=erlc\ %
-endfunction
-
-function! s:show_msg()
-    let pos = getpos(".")
-    if has_key(b:error_list, pos[1])
-        let item = get(b:error_list, pos[1])
-        echo item.msg
-        let b:is_showing_msg = 1
-    else
-        if exists("b:is_showing_msg") && b:is_showing_msg == 1
-            echo
-            let b:is_showing_msg = 0
-        endif
-    endif
-endf
-
-function! s:clear_matches()
-    call clearmatches()
-    let b:error_list = {}
-    if exists("b:is_showing_msg") && b:is_showing_msg == 1
-        echo
-        let b:is_showing_msg = 0
-    endif
-endfunction
-
-CompilerSet makeprg=erlc\ %
-CompilerSet errorformat=%f:%l:\ %tarning:\ %m,%E%f:%l:\ %m
-
-if g:erlangHighlightErrors
-    autocmd BufLeave *.erl call s:clear_matches()
-    autocmd BufEnter *.erl call s:clear_matches()
-    autocmd BufWritePost *.erl call HighlightErlangErrors()
-    autocmd CursorHold *.erl call s:show_msg()
-    autocmd CursorMoved *.erl call s:show_msg()
-endif

compiler/eruby.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+  
 " Vim compiler file
 " Language:		eRuby
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
@@ -37,3 +39,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+
+endif

compiler/exunit.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+  
 " Vim compiler file
 " Language:     ExUnit
 " Maintainer:   Rein Henrichs <rein.henrichs@gmail.com>
@@ -22,3 +24,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+
+endif

compiler/go.vim

@@ -1,30 +0,0 @@
-" Copyright 2013 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.
-"
-" compiler/go.vim: Vim compiler file for Go.
-
-if exists("current_compiler")
-    finish
-endif
-let current_compiler = "go"
-
-if exists(":CompilerSet") != 2
-    command -nargs=* CompilerSet setlocal <args>
-endif
-
-let s:save_cpo = &cpo
-set cpo-=C
-
-CompilerSet makeprg=go\ build
-CompilerSet errorformat=
-        \%-G#\ %.%#,
-        \%A%f:%l:%c:\ %m,
-        \%A%f:%l:\ %m,
-        \%C%*\\s%m,
-        \%-G%.%#
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim:ts=4:sw=4:et

compiler/haml.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
+  
 " Vim compiler file
 " Compiler:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -26,3 +28,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
+
+endif

compiler/rake.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+  
 " Vim compiler file
 " Language:		Rake
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -37,3 +39,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+
+endif

compiler/rspec.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+  
 " Vim compiler file
 " Language:		RSpec
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -31,3 +33,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+
+endif

compiler/ruby.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+  
 " Vim compiler file
 " Language:		Ruby
 " Function:		Syntax check and/or error reporting
@@ -43,3 +45,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+
+endif

compiler/rubyunit.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+  
 " Vim compiler file
 " Language:		Test::Unit - Ruby Unit Testing Framework
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
@@ -33,3 +35,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+
+endif

compiler/rustc.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+  
 " Vim compiler file
 " Compiler:         Rust Compiler
 " Maintainer:       Chris Morgan <me@chrismorgan.info>
@@ -31,3 +33,5 @@ CompilerSet errorformat=
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
+endif

compiler/sass.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
+  
 " Vim compiler file
 " Compiler:	Sass
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -28,3 +30,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
+
+endif

compiler/sbt.vim

@@ -0,0 +1,34 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
+  
+" Vim compiler file
+" Language:             Scala SBT (http://www.scala-sbt.org/)
+" Maintainer:           Derek Wyatt
+" URL:                  https://github.com/derekwyatt/vim-scala
+" License:              Apache 2
+" ----------------------------------------------------------------------------
+
+if exists('current_compiler')
+  finish
+endif
+let current_compiler = 'sbt'
+
+if exists(':CompilerSet') != 2          " older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=sbt\ -Dsbt.log.noformat=true\ compile
+
+CompilerSet errorformat=
+      \%E\ %#[error]\ %f:%l:\ %m,%C\ %#[error]\ %p^,%-C%.%#,%Z,
+      \%W\ %#[warn]\ %f:%l:\ %m,%C\ %#[warn]\ %p^,%-C%.%#,%Z,
+      \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set sw=2 sts=2 ts=8 et:
+
+endif

compiler/typescript.vim

@@ -1,8 +1,20 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
+  
 if exists("current_compiler")
   finish
 endif
 let current_compiler = "typescript"
 
-CompilerSet makeprg=tsc\ $*\ %
+if !exists("g:typescript_compiler_binary")
+  let g:typescript_compiler_binary = "tsc"
+endif
+
+if !exists("g:typescript_compiler_options")
+  let g:typescript_compiler_options = ""
+endif
+
+let &l:makeprg = g:typescript_compiler_binary . ' ' . g:typescript_compiler_options . ' $*  %'
 
 CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m
+
+endif

ftdetect/polyglot.vim

@@ -1,5 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
+  
 au BufRead,BufNewFile *.ino,*.pde set filetype=arduino
-autocmd BufNewFile,BufRead *.clj,*.cljs,*.edn setlocal filetype=clojure
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
+  
+au BufNewFile,BufRead *.blade.php set filetype=blade
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
+  
+augroup CJSX
+  au!
+  autocmd BufNewFile,BufRead *.csx,*.cjsx set filetype=coffee
+augroup END
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
+  
+autocmd BufNewFile,BufRead *.clj,*.cljs,*.edn,*.cljx,*.cljc setlocal filetype=clojure
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
 autocmd BufNewFile,BufRead *.coffee set filetype=coffee
 autocmd BufNewFile,BufRead *Cakefile set filetype=coffee
 autocmd BufNewFile,BufRead *.coffeekup,*.ck set filetype=coffee
@@ -10,19 +29,49 @@ function! s:DetectCoffee()
     endif
 endfunction
 autocmd BufNewFile,BufRead * call s:DetectCoffee()
-au BufRead,BufNewFile *.csv,*.dat,*.tsv,*.tab set filetype=csv
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
+  
 autocmd BufNewFile,BufReadPost *.feature,*.story set filetype=cucumber
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
+  
 au BufNewFile,BufRead Dockerfile set filetype=dockerfile
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+  
+au BufRead,BufNewFile *.eex set filetype=eelixir
+au FileType eelixir setl sw=2 sts=2 et iskeyword+=!,?
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+  
 au BufRead,BufNewFile *.ex,*.exs set filetype=elixir
 au FileType elixir setl sw=2 sts=2 et iskeyword+=!,?
+function! s:DetectElixir()
+    if getline(1) =~ '^#!.*\<elixir\>'
+        set filetype=elixir
+    endif
+endfunction
+autocmd BufNewFile,BufRead * call s:DetectElixir()
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
+  
 autocmd BufNewFile,BufRead *.em set filetype=ember-script
 autocmd FileType ember-script set tabstop=2|set shiftwidth=2|set expandtab
-autocmd BufNewFile,BufRead *.git/{,modules/**/}{COMMIT_EDIT,TAG_EDIT,MERGE_,}MSG set ft=gitcommit
+endif
-autocmd BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules set ft=gitconfig
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
-autocmd BufNewFile,BufRead */.config/git/config                set ft=gitconfig
+  
-autocmd BufNewFile,BufRead *.git/modules/**/config             set ft=gitconfig
+autocmd BufNewFile,BufRead *.emblem set filetype=emblem
-autocmd BufNewFile,BufRead git-rebase-todo                     set ft=gitrebase
+autocmd FileType emblem set tabstop=2|set shiftwidth=2|set expandtab
-autocmd BufNewFile,BufRead .gitsendemail.*                     set ft=gitsendemail
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
+  
+autocmd BufNewFile,BufRead *.git/{,modules/**/,worktrees/*/}{COMMIT_EDIT,TAG_EDIT,MERGE_,}MSG set ft=gitcommit
+autocmd BufNewFile,BufRead *.git/config,.gitconfig,gitconfig,.gitmodules set ft=gitconfig
+autocmd BufNewFile,BufRead */.config/git/config                          set ft=gitconfig
+autocmd BufNewFile,BufRead *.git/modules/**/config                       set ft=gitconfig
+autocmd BufNewFile,BufRead git-rebase-todo                               set ft=gitrebase
+autocmd BufNewFile,BufRead .gitsendemail.*                               set ft=gitsendemail
 autocmd BufNewFile,BufRead *.git/**
       \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
       \   set ft=git |
@@ -35,47 +84,77 @@ autocmd BufNewFile,BufRead *
       \ if getline(1) =~ '^From \x\{40\} Mon Sep 17 00:00:00 2001$' |
       \   set filetype=gitsendemail |
       \ endif
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
+  
+autocmd! BufNewFile,BufRead *.glsl,*.geom,*.vert,*.frag,*.gsh,*.vsh,*.fsh,*.vs,*.fs,*.gs,*.tcs,*.tes set filetype=glsl
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
+  
 let s:current_fileformats = ''
 let s:current_fileencodings = ''
 function! s:gofiletype_pre()
-  let s:current_fileformats = &g:fileformats
+    let s:current_fileformats = &g:fileformats
-  let s:current_fileencodings = &g:fileencodings
+    let s:current_fileencodings = &g:fileencodings
-  set fileencodings=utf-8 fileformats=unix
+    set fileencodings=utf-8 fileformats=unix
-  setlocal filetype=go
+    setlocal filetype=go
 endfunction
 function! s:gofiletype_post()
-  let &g:fileformats = s:current_fileformats
+    let &g:fileformats = s:current_fileformats
-  let &g:fileencodings = s:current_fileencodings
+    let &g:fileencodings = s:current_fileencodings
 endfunction
-au BufNewFile *.go setlocal filetype=go fileencoding=utf-8 fileformat=unix
+au BufNewFile *.go setfiletype go | setlocal fileencoding=utf-8 fileformat=unix
 au BufRead *.go call s:gofiletype_pre()
 au BufReadPost *.go call s:gofiletype_post()
+au BufRead,BufNewFile *.tmpl set filetype=gohtmltmpl
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
+  
 autocmd BufNewFile,BufRead *.haml,*.hamlbars,*.hamlc setf haml
 autocmd BufNewFile,BufRead *.sass setf sass
 autocmd BufNewFile,BufRead *.scss setf scss
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haxe') == -1
+  
 autocmd BufNewFile,BufRead *.hx setf haxe
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jade') == -1
+  
 autocmd BufNewFile,BufReadPost *.jade set filetype=jade
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jasmine') == -1
+  
 autocmd BufNewFile,BufRead *Spec.js,*_spec.js set filetype=jasmine.javascript syntax=jasmine
-au BufNewFile,BufRead *.js setf javascript
+endif
-au BufNewFile,BufRead *.jsm setf javascript
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
-au BufNewFile,BufRead Jakefile setf javascript
+  
-fun! s:SelectJavascript()
-  if getline(1) =~# '^#!.*/bin/env\s\+node\>'
-    set ft=javascript
-  endif
-endfun
-au BufNewFile,BufRead * call s:SelectJavascript()
 autocmd BufNewFile,BufRead *.json set filetype=json
-augroup json_autocmd
+autocmd BufNewFile,BufRead *.jsonp set filetype=json
-  autocmd!
+endif
-  autocmd FileType json setlocal autoindent
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
-  autocmd FileType json setlocal formatoptions=tcq2l
+  
-  autocmd FileType json setlocal foldmethod=syntax
+au BufNewFile,BufRead *.ejs set filetype=jst
-augroup END
+au BufNewFile,BufRead *.jst set filetype=jst
-au BufNewFile,BufRead *.ejs		set filetype=jst
+au BufNewFile,BufRead *.djs set filetype=jst
-au BufNewFile,BufRead *.jst  		set filetype=jst
 au BufNewFile,BufRead *.hamljs set filetype=jst
+au BufNewFile,BufRead *.ect set filetype=jst
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+  
+au BufRead,BufNewFile *.jl		let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp<"
+au BufRead,BufNewFile *.jl		set filetype=julia
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
+  
+autocmd BufNewFile,BufRead *.kt setfiletype kotlin
+autocmd BufNewFile,BufRead *.kts setfiletype kotlin
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
+  
 autocmd BufNewFile,BufRead *.less setf less
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
+  
 au BufNewFile,BufRead *.liquid					set ft=liquid
 au BufNewFile,BufRead */_layouts/*.html,*/_includes/*.html	set ft=liquid
 au BufNewFile,BufRead *.html,*.xml,*.textile
@@ -88,21 +167,40 @@ au BufNewFile,BufRead *.markdown,*.mkd,*.mkdn,*.md
 au BufNewFile,BufRead */templates/**.liquid,*/layout/**.liquid,*/snippets/**.liquid
       \ let b:liquid_subtype = 'html' |
       \ set ft=liquid |
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
+  
 autocmd BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mkd,*.mkdn
       \ if &ft =~# '^\%(conf\|modula2\)$' |
       \   set ft=markdown |
       \ else |
       \   setf markdown |
       \ endif
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
+  
 autocmd BufRead *.html
     \ if getline(1) =~ '^\(%\|<[%&].*>\)' |
     \     set filetype=mason |
     \ endif
-if has("autocmd")
-  au  BufNewFile,BufRead *.mustache,*.handlebars,*.hbs,*.hogan,*.hulk,*.hjs set filetype=html syntax=mustache | runtime! ftplugin/mustache.vim ftplugin/mustache*.vim ftplugin/mustache/*.vim
 endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
+  
+if has("autocmd")
+  au  BufNewFile,BufRead *.mustache,*.hogan,*.hulk,*.hjs set filetype=html.mustache syntax=mustache | runtime! ftplugin/mustache.vim ftplugin/mustache*.vim ftplugin/mustache/*.vim
+  au  BufNewFile,BufRead *.handlebars,*.hbs set filetype=html.handlebars syntax=mustache | runtime! ftplugin/mustache.vim ftplugin/mustache*.vim ftplugin/mustache/*.vim
+endif
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
+  
 au BufRead,BufNewFile /etc/nginx/*,/usr/local/nginx/*,*/nginx/vhosts.d/*,nginx.conf if &ft == '' | setfiletype nginx | endif
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
+  
 au BufRead,BufNewFile *.cl set filetype=opencl
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
+  
 function! s:DetectPerl6()
   let line_no = 1
   let eof     = line('$')
@@ -121,7 +219,7 @@ function! s:DetectPerl6()
       endif
       if line =~ '^\s*\%(use\s\+\)\=v6\%(\.\d\%(\.\d\)\=\)\=;'
         set filetype=perl6 " we matched a 'use v6' declaration
-      elseif line =~ '^\s*\%(\%(my\|our\)\s\+\)\=\(module\|class\|role\|enum\|grammar\)'
+      elseif line =~ '^\s*\%(\%(my\|our\)\s\+\)\=\%(unit\s\+\)\=\(module\|class\|role\|enum\|grammar\)'
         set filetype=perl6 " we found a class, role, module, enum, or grammar declaration
       endif
       break " we either found what we needed, or we found a non-POD, non-comment,
@@ -130,9 +228,29 @@ function! s:DetectPerl6()
   endwhile
 endfunction
 autocmd BufReadPost *.pl,*.pm,*.t call s:DetectPerl6()
-autocmd BufNew,BufRead *.nqp setf perl6
+autocmd BufNew,BufNewFile,BufRead *.nqp setf perl6
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
+  
 autocmd BufNewFile,BufRead *.proto setfiletype proto
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
+  
+au BufNewFile,BufRead   *.ps1   set ft=ps1
+au BufNewFile,BufRead   *.psd1  set ft=ps1
+au BufNewFile,BufRead   *.psm1  set ft=ps1
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
+  
+au BufNewFile,BufRead   *.ps1xml   set ft=ps1xml
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
+  
 au! BufRead,BufNewFile *.pp setfiletype puppet
+au! BufRead,BufNewFile Puppetfile setfiletype ruby
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+  
 function! s:setf(filetype) abort
   if &filetype !=# a:filetype
     let &filetype = a:filetype
@@ -160,18 +278,47 @@ au BufNewFile,BufRead Puppetfile		call s:setf('ruby')
 au BufNewFile,BufRead [Bb]uildfile		call s:setf('ruby')
 au BufNewFile,BufRead Appraisals		call s:setf('ruby')
 au BufNewFile,BufRead Podfile,*.podspec		call s:setf('ruby')
+au BufNewFile,BufRead [rR]outefile		call s:setf('ruby')
+au BufNewFile,BufRead .simplecov		set filetype=ruby
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+  
 au BufRead,BufNewFile *.rs set filetype=rust
-au BufRead,BufNewFile *.sbt set filetype=sbt
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sbt') == -1
+  
+au BufRead,BufNewFile *.sbt set filetype=sbt.scala
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
+  
 fun! s:DetectScala()
-    if getline(1) == '#!/usr/bin/env scala'
+    if getline(1) =~# '^#!\(/usr\)\?/bin/env\s\+scalas\?'
         set filetype=scala
     endif
 endfun
-au BufRead,BufNewFile *.scala,*.sbt set filetype=scala
+au BufRead,BufNewFile *.scala set filetype=scala
 au BufRead,BufNewFile * call s:DetectScala()
+au BufRead,BufNewFile *.sbt setfiletype sbt.scala
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
+  
 autocmd BufNewFile,BufRead *.slim set filetype=slim
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
+  
+au BufNewFile,BufRead *.sol setf solidity
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
+  
 autocmd BufNewFile,BufReadPost *.styl set filetype=stylus
 autocmd BufNewFile,BufReadPost *.stylus set filetype=stylus
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
+  
+autocmd BufNewFile,BufRead *.swift set filetype=swift
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemd') == -1
+  
 au BufNewFile,BufRead *.automount set filetype=systemd
 au BufNewFile,BufRead *.mount     set filetype=systemd
 au BufNewFile,BufRead *.path      set filetype=systemd
@@ -180,9 +327,40 @@ au BufNewFile,BufRead *.socket    set filetype=systemd
 au BufNewFile,BufRead *.swap      set filetype=systemd
 au BufNewFile,BufRead *.target    set filetype=systemd
 au BufNewFile,BufRead *.timer     set filetype=systemd
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
+  
 au BufRead,BufNewFile *.textile set filetype=textile
-autocmd BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'thrift') == -1
+  
+au BufNewFile,BufRead *.thrift setlocal filetype=thrift
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
+  
+autocmd BufNewFile,BufRead {.,}tmux.conf{.*,} setlocal filetype=tmux
+autocmd BufNewFile,BufRead {.,}tmux.conf{.*,} setlocal commentstring=#\ %s
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1
+  
 autocmd BufNewFile,BufRead *.toml set filetype=toml
+autocmd BufNewFile,BufRead Cargo.lock set filetype=toml
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
+  
 autocmd BufNewFile,BufRead *.twig set filetype=twig
 autocmd BufNewFile,BufRead *.html.twig set filetype=html.twig
-autocmd BufNewFile,BufRead *.ts setlocal filetype=typescript
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
+  
+autocmd BufNewFile,BufRead *.ts,*.tsx setlocal filetype=typescript
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
+  
+autocmd BufRead *.vala,*.vapi set efm=%f:%l.%c-%[%^:]%#:\ %t%[%^:]%#:\ %m
+au BufRead,BufNewFile *.vala,*.vapi setfiletype vala
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vm') == -1
+  
+au BufRead,BufNewFile *.vm set ft=velocity syntax=velocity
+endif

ftplugin/clojure.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
+  
 " Vim filetype plugin file
 " Language:	Clojure
 " Author:	Meikel Brandmeyer <mb@kotka.de>
@@ -93,3 +95,5 @@ let &cpo = s:cpo_save
 unlet! s:cpo_save s:setting s:dir
 
 " vim:sts=8:sw=8:ts=8:noet
+
+endif

ftplugin/coffee.vim

@@ -1,5 +1,7 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
 " Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
+" Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
@@ -13,6 +15,7 @@ call coffee#CoffeeSetUpVariables()
 setlocal formatoptions-=t formatoptions+=croql
 setlocal comments=:# commentstring=#\ %s
 setlocal omnifunc=javascriptcomplete#CompleteJS
+setlocal suffixesadd+=coffee
 
 " Create custom augroups.
 augroup CoffeeBufUpdate | augroup END
@@ -330,7 +333,7 @@ function! s:CoffeeLint(startline, endline, bang, args)
   endif
 
   let output = system(g:coffee_linter .
-  \                   ' -s --csv' .
+  \                   ' -s --reporter csv' .
   \                   ' ' . b:coffee_litcoffee .
   \                   ' ' . g:coffee_lint_options .
   \                   ' ' . a:args .
@@ -394,11 +397,13 @@ if !exists('b:coffee_run_buf')
   call s:CoffeeRunResetVars()
 endif
 
-command! -range=% -bar -nargs=* -complete=customlist,s:CoffeeComplete
+command! -buffer -range=% -bar -nargs=* -complete=customlist,s:CoffeeComplete
 \        CoffeeCompile call s:CoffeeCompile(<line1>, <line2>, <q-args>)
-command! -bar -nargs=* -complete=customlist,s:CoffeeComplete
+command! -buffer -bar -nargs=* -complete=customlist,s:CoffeeComplete
 \        CoffeeWatch call s:CoffeeWatch(<q-args>)
-command! -range=% -bar -nargs=* CoffeeRun
+command! -buffer -range=% -bar -nargs=* CoffeeRun
 \        call s:CoffeeRun(<line1>, <line2>, <q-args>)
-command! -range=% -bang -bar -nargs=* CoffeeLint
+command! -buffer -range=% -bang -bar -nargs=* CoffeeLint
 \        call s:CoffeeLint(<line1>, <line2>, <q-bang>, <q-args>)
+
+endif

ftplugin/cucumber.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
+  
 " Vim filetype plugin
 " Language:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -19,6 +21,9 @@ setlocal omnifunc=CucumberComplete
 let b:undo_ftplugin = "setl fo< com< cms< ofu<"
 
 let b:cucumber_root = expand('%:p:h:s?.*[\/]\%(features\|stories\)\zs[\/].*??')
+if !exists("b:cucumber_steps_glob")
+  let b:cucumber_steps_glob = b:cucumber_root.'/**/*.rb'
+endif
 
 if !exists("g:no_plugin_maps") && !exists("g:no_cucumber_maps")
   cnoremap <SID>foldopen <Bar>if &foldopen =~# 'tag'<Bar>exe 'norm! zv'<Bar>endif
@@ -52,7 +57,7 @@ endfunction
 function! s:allsteps()
   let step_pattern = '\C^\s*\K\k*\>\s*(\=\s*\zs\S.\{-\}\ze\s*)\=\s*\%(do\|{\)\s*\%(|[^|]*|\s*\)\=\%($\|#\)'
   let steps = []
-  for file in split(glob(b:cucumber_root.'/**/*.rb'),"\n")
+  for file in split(glob(b:cucumber_steps_glob),"\n")
     let lines = readfile(file)
     let num = 0
     for line in lines
@@ -145,3 +150,5 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:set sts=2 sw=2:
+
+endif

ftplugin/eelixir.vim

@@ -0,0 +1,95 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+  
+" Vim filetype plugin
+" Language: Embedded Elixir
+" URL:      https://github.com/elixir-lang/vim-elixir
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+let s:save_cpo = &cpo
+set cpo-=C
+
+let s:undo_ftplugin = ""
+let s:browsefilter = "All Files (*.*)\t*.*\n"
+let s:match_words = ""
+
+if !exists("g:eelixir_default_subtype")
+  let g:eelixir_default_subtype = "html"
+endif
+
+if !exists("b:eelixir_subtype")
+  let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
+  let b:eelixir_subtype = matchstr(s:lines,'eelixir_subtype=\zs\w\+')
+  if b:eelixir_subtype == ''
+    let b:eelixir_subtype = matchstr(&filetype,'^eex\.\zs\w\+')
+  endif
+  if b:eelixir_subtype == ''
+    let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
+  endif
+  if b:eelixir_subtype == 'ex'
+    let b:eelixir_subtype = 'elixir'
+  elseif b:eelixir_subtype == 'exs'
+    let b:eelixir_subtype = 'elixir'
+  elseif b:eelixir_subtype == 'yml'
+    let b:eelixir_subtype = 'yaml'
+  elseif b:eelixir_subtype == 'js'
+    let b:eelixir_subtype = 'javascript'
+  elseif b:eelixir_subtype == 'txt'
+    " Conventional; not a real file type
+    let b:eelixir_subtype = 'text'
+  elseif b:eelixir_subtype == ''
+    let b:eelixir_subtype = g:eelixir_default_subtype
+  endif
+endif
+
+if exists("b:eelixir_subtype") && b:eelixir_subtype != ''
+  exe "runtime! ftplugin/".b:eelixir_subtype.".vim ftplugin/".b:eelixir_subtype."_*.vim ftplugin/".b:eelixir_subtype."/*.vim"
+else
+  runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
+endif
+unlet! b:did_ftplugin
+
+" Override our defaults if these were set by an included ftplugin.
+if exists("b:undo_ftplugin")
+  let s:undo_ftplugin = b:undo_ftplugin
+  unlet b:undo_ftplugin
+endif
+if exists("b:browsefilter")
+  let s:browsefilter = b:browsefilter
+  unlet b:browsefilter
+endif
+if exists("b:match_words")
+  let s:match_words = b:match_words
+  unlet b:match_words
+endif
+
+runtime! ftplugin/elixir.vim ftplugin/elixir_*.vim ftplugin/elixir/*.vim
+let b:did_ftplugin = 1
+
+" Combine the new set of values with those previously included.
+if exists("b:undo_ftplugin")
+  let s:undo_ftplugin = b:undo_ftplugin . " | " . s:undo_ftplugin
+endif
+if exists ("b:browsefilter")
+  let s:browsefilter = substitute(b:browsefilter,'\cAll Files (\*\.\*)\t\*\.\*\n','','') . s:browsefilter
+endif
+if exists("b:match_words")
+  let s:match_words = b:match_words . ',' . s:match_words
+endif
+
+" Load the combined list of match_words for matchit.vim
+if exists("loaded_matchit")
+  let b:match_words = s:match_words
+endif
+
+setlocal comments=:<%#
+setlocal commentstring=<%#\ %s\ %>
+
+let b:undo_ftplugin = "setl cms< "
+      \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
+
+let &cpo = s:save_cpo
+
+endif

ftplugin/elixir.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+  
 " Vim filetype plugin
 " Language:    Elixir
 " Maintainer:  Carlos Galdino <carloshsgaldino@gmail.com>
@@ -23,3 +25,5 @@ endif
 
 setlocal comments=:#
 setlocal commentstring=#\ %s
+
+endif

ftplugin/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
@@ -15,3 +17,5 @@ setlocal smartindent
 setlocal formatoptions-=t formatoptions+=croqlj
 setlocal comments=:#
 setlocal commentstring=#\ %s
+
+endif

ftplugin/emblem.vim

@@ -0,0 +1,21 @@
+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
+
+setlocal tabstop=2
+setlocal softtabstop=2
+setlocal shiftwidth=2
+setlocal smarttab
+setlocal expandtab
+setlocal smartindent
+
+setlocal formatoptions=q
+setlocal comments=:/
+setlocal commentstring=/\ %s
+
+endif

ftplugin/erlang.vim

@@ -1,151 +0,0 @@
-" Vim ftplugin file
-" Language:    Erlang
-" Maintainer:  Oscar Hellström <oscar@oscarh.net>
-" URL:         http://personal.oscarh.net
-" Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
-" Version:     2010-09-03
-" ------------------------------------------------------------------------------
-" Usage:
-"
-" To enable folding put in your vimrc:
-" set foldenable
-"
-" Folding will make only one fold for a complete function, even though it has
-" more than one function head and body.
-"
-" To change this behaviour put in your vimrc file:
-" let g:erlangFoldSplitFunction=1
-"
-" ------------------------------------------------------------------------------
-" Plugin init
-if exists("b:did_ftplugin")
-	finish
-endif
-
-" Don't load any other
-let b:did_ftplugin=1
-
-if exists('s:doneFunctionDefinitions')
-	call s:SetErlangOptions()
-	finish
-endif
-
-let s:doneFunctionDefinitions=1
-
-" Local settings
-function s:SetErlangOptions()
-	compiler erlang
-	if version >= 700
-		setlocal omnifunc=erlangcomplete#Complete
-	endif
-
-	setlocal foldmethod=expr
-	setlocal foldexpr=GetErlangFold(v:lnum)
-	setlocal foldtext=ErlangFoldText()
-endfunction
-
-" Define folding functions
-if !exists("*GetErlangFold")
-	" Folding params
-	let s:ErlangFunBegin    = '^\a\w*(.*$'
-	let s:ErlangFunEnd      = '^[^%]*\.\s*\(%.*\)\?$'
-	let s:ErlangBlankLine   = '^\s*\(%.*\)\?$'
-
-	" Auxiliary fold functions
-	function s:GetNextNonBlank(lnum)
-		let lnum = nextnonblank(a:lnum + 1)
-		let line = getline(lnum)
-		while line =~ s:ErlangBlankLine && 0 != lnum
-			let lnum = nextnonblank(lnum + 1)
-			let line = getline(lnum)
-		endwhile
-		return lnum
-	endfunction
-
-	function s:GetFunName(str)
-		return matchstr(a:str, '^\a\w*(\@=')
-	endfunction
-
-	function s:GetFunArgs(str, lnum)
-		let str = a:str
-		let lnum = a:lnum
-		while str !~ '->\s*\(%.*\)\?$'
-			let lnum = s:GetNextNonBlank(lnum)
-			if 0 == lnum " EOF
-				return ""
-			endif
-			let str .= getline(lnum)
-		endwhile
-		return matchstr(str, 
-			\ '\(^(\s*\)\@<=.*\(\s*)\(\s\+when\s\+.*\)\?\s\+->\s*\(%.*\)\?$\)\@=')
-	endfunction
-
-	function s:CountFunArgs(arguments)
-		let pos = 0
-		let ac = 0 " arg count
-		let arguments = a:arguments
-		
-		" Change list / tuples into just one A(rgument)
-		let erlangTuple = '{\([A-Za-z_,|=\-\[\]]\|\s\)*}'
-		let erlangList  = '\[\([A-Za-z_,|=\-{}]\|\s\)*\]'
-
-		" FIXME: Use searchpair?
-		while arguments =~ erlangTuple
-			let arguments = substitute(arguments, erlangTuple, "A", "g")
-		endwhile
-		" FIXME: Use searchpair?
-		while arguments =~ erlangList
-			let arguments = substitute(arguments, erlangList, "A", "g")
-		endwhile
-		
-		let len = strlen(arguments)
-		while pos < len && pos > -1
-			let ac += 1
-			let pos = matchend(arguments, ',\s*', pos)
-		endwhile
-		return ac
-	endfunction
-
-	" Main fold function
-	function GetErlangFold(lnum)
-		let lnum = a:lnum
-		let line = getline(lnum)
-
-		if line =~ s:ErlangFunEnd
-			return '<1'
-		endif
-
-		if line =~ s:ErlangFunBegin && foldlevel(lnum - 1) == 1
-			if exists("g:erlangFoldSplitFunction") && g:erlangFoldSplitFunction
-				return '>1'
-			else
-				return '1'
-			endif
-		endif
-
-		if line =~ s:ErlangFunBegin
-			return '>1'
-		endif
-
-		return '='
-	endfunction
-
-	" Erlang fold description (foldtext function)
-	function ErlangFoldText()
-		let foldlen = v:foldend - v:foldstart
-		if 1 < foldlen
-			let lines = "lines"
-		else
-			let lines = "line"
-		endif
-		let line = getline(v:foldstart)
-		let name = s:GetFunName(line)
-		let arguments = s:GetFunArgs(strpart(line, strlen(name)), v:foldstart)
-		let argcount = s:CountFunArgs(arguments)
-		let retval = "+" . v:folddashes . " " . name . "/" . argcount
-		let retval .= " (" . foldlen . " " . lines . ")"
-		return retval
-	endfunction
-endif
-
-call s:SetErlangOptions()

ftplugin/erlang_refactor.vim

@@ -1,295 +0,0 @@
-" Erlang refactor file
-" Language:   Erlang
-" Maintainer: Pawel 'kTT' Salata <rockplayer.pl@gmail.com>
-" URL:        http://ktototaki.info
-
-if exists("b:did_ftplugin_erlang")
-    finish
-endif
-
-" Don't load any other
-let b:did_ftplugin_erlang=1
-
-if !exists('g:erlangRefactoring') || g:erlangRefactoring == 0
-    finish
-endif
-
-if !exists('g:erlangWranglerPath')
-    let g:erlangWranglerPath = '/usr/share/wrangler/'
-endif
-
-if glob(g:erlangWranglerPath) == ""
-    call confirm("Wrong path to wrangler dir")
-    finish
-endif
-
-autocmd VimLeavePre * call StopWranglerServer()
-
-let s:erlangServerName = "wrangler_vim"
-
-" Starting background erlang session with wrangler on
-function! StartWranglerServer()
-    let wranglerEbinDir = g:erlangWranglerPath . "/ebin"
-    let command = "erl_call -s -sname " . s:erlangServerName . " -x 'erl -pa " . wranglerEbinDir . "'"
-    call system(command)
-    call s:send_rpc('application', 'start', '[wrangler_app]')
-endfunction
-
-" Stopping erlang session
-function! StopWranglerServer()
-    echo s:send_rpc('erlang', 'halt', '')
-endfunction
-
-" Sending rpc call to erlang session
-function! s:send_rpc(module, fun, args)
-    let command = "erl_call -sname " . s:erlangServerName . " -a '" . a:module . " " . a:fun . " " . a:args . "'"
-    let result = system(command)
-    if match(result, 'erl_call: failed to connect to node .*') != -1
-        call StartWranglerServer()
-        return system(command)
-    endif
-    return result
-endfunction
-
-function! ErlangUndo()
-    echo s:send_rpc("wrangler_undo_server", "undo", "[]")
-    :e!
-endfunction
-
-function! s:trim(text)
-    return substitute(a:text, "^\\s\\+\\|\\s\\+$", "", "g")
-endfunction
-
-function! s:get_msg(result, tuple_start)
-    let msg_begin = '{' . a:tuple_start . ','
-    let matching_start =  match(a:result, msg_begin)
-    if matching_start != -1
-        return s:trim(matchstr(a:result, '[^}]*', matching_start + strlen(msg_begin)))
-    endif
-    return ""
-endfunction
-
-" Check if there is an error in result
-function! s:check_for_error(result)
-    let msg = s:get_msg(a:result, 'ok')
-    if msg != ""
-        return [0, msg]
-    endif
-    let msg = s:get_msg(a:result, 'warning')
-    if msg != ""
-        return [1, msg]
-    endif
-    let msg = s:get_msg(a:result, 'error')
-    if msg != ""
-        return [2, msg]
-    endif
-    return [-1, ""]
-endfunction
-
-" Sending apply changes to file
-function! s:send_confirm()
-    let choice = confirm("What do you want?", "&Preview\n&Confirm\nCa&ncel", 0)
-    if choice == 1
-        echo "TODO: Display preview :)"
-    elseif choice == 2
-        let module = 'wrangler_preview_server'
-        let fun = 'commit'
-        let args = '[]'
-        return s:send_rpc(module, fun, args)
-    else
-        let module = 'wrangler_preview_server'
-        let fun = 'abort'
-        let args = '[]'
-        return s:send_rpc(module, fun, args)
-        echo "Canceled"
-    endif
-endfunction
-
-" Manually send confirm, for testing purpose only
-function! SendConfirm()
-    echo s:send_confirm()
-endfunction
-
-" Format and send function extracton call
-function! s:call_extract(start_line, start_col, end_line, end_col, name)
-    let file = expand("%:p")
-    let module = 'wrangler'
-    let fun = 'fun_extraction'
-    let args = '["' . file . '", {' . a:start_line . ', ' . a:start_col . '}, {' . a:end_line . ', ' . a:end_col . '}, "' . a:name . '", ' . &sw . ']'
-    let result = s:send_rpc(module, fun, args)
-    let [error_code, msg] = s:check_for_error(result)
-    if error_code != 0
-        call confirm(msg)
-        return 0
-    endif
-    echo "This files will be changed: " . matchstr(msg, "[^]]*", 1)
-    echo s:send_confirm()
-    return 1
-endfunction
-
-function! ErlangExtractFunction(mode) range
-    silent w!
-    let name = inputdialog("New function name: ")
-    if name != ""
-        if a:mode == "v"
-            let start_pos = getpos("'<")
-            let start_line = start_pos[1]
-            let start_col = start_pos[2]
-
-            let end_pos = getpos("'>")
-            let end_line = end_pos[1]
-            let end_col = end_pos[2]
-        elseif a:mode == "n"
-            let pos = getpos(".")
-            let start_line = pos[1]
-            let start_col = pos[2]
-            let end_line = pos[1]
-            let end_col = pos[2]
-        else
-            echo "Mode not supported."
-            return
-        endif
-        if s:call_extract(start_line, start_col, end_line, end_col, name)
-            let temp = &autoread
-            set autoread
-            :e
-            if temp == 0
-                set noautoread
-            endif
-        endif
-    else
-        echo "Empty function name. Ignoring."
-    endif
-endfunction
-nmap <A-r>e :call ErlangExtractFunction("n")<ENTER>
-vmap <A-r>e :call ErlangExtractFunction("v")<ENTER>
-
-function! s:call_rename(mode, line, col, name, search_path)
-    let file = expand("%:p")
-    let module = 'wrangler'
-    let fun = 'rename_' . a:mode
-    let args = '["' . file .'", '
-    if a:mode != "mod"
-         let args = args . a:line . ', ' . a:col . ', '
-    endif
-    let args = args . '"' . a:name . '", ["' . a:search_path . '"], ' . &sw . ']'
-    let result = s:send_rpc(module, fun, args)
-    let [error_code, msg] = s:check_for_error(result)
-    if error_code != 0
-        call confirm(msg)
-        return 0
-    endif
-    echo "This files will be changed: " . matchstr(msg, "[^]]*", 1)
-    echo s:send_confirm()
-    return 1
-endfunction
-
-function! ErlangRename(mode)
-    silent w!
-    if a:mode == "mod"
-        let name = inputdialog('Rename module to: ')
-    else
-        let name = inputdialog('Rename "' . expand("<cword>") . '" to: ')
-    endif
-    if name != ""
-        let search_path = expand("%:p:h")
-        "let search_path = inputdialog('Search path: ', expand("%:p:h"))
-        let pos = getpos(".")
-        let line = pos[1]
-        let col = pos[2]
-        let current_filename = expand("%")
-        let current_filepath = expand("%:p")
-        let new_filename = name . '.erl'
-        if s:call_rename(a:mode, line, col, name, search_path)
-            if a:mode == "mod"
-                execute ':bd ' . current_filename
-                execute ':e ' . new_filename
-                silent execute '!mv ' . current_filepath . ' ' . current_filepath . '.bak'
-                redraw!
-            else
-                let temp = &autoread
-                set autoread
-                :e
-                if temp == 0
-                    set noautoread
-                endif
-            endif
-        endif
-    else
-        echo "Empty name. Ignoring."
-    endif
-endfunction
-
-function! ErlangRenameFunction()
-    call ErlangRename("fun")
-endfunction
-map <A-r>f :call ErlangRenameFunction()<ENTER>
-
-function! ErlangRenameVariable()
-    call ErlangRename("var")
-endfunction
-map <A-r>v :call ErlangRenameVariable()<ENTER>
-
-function! ErlangRenameModule()
-    call ErlangRename("mod")
-endfunction
-map <A-r>m :call ErlangRenameModule()<ENTER>
-
-function! ErlangRenameProcess()
-    call ErlangRename("process")
-endfunction
-map <A-r>p :call ErlangRenameProcess()<ENTER>
-
-function! s:call_tuple_fun_args(start_line, start_col, end_line, end_col, search_path)
-    let file = expand("%:p")
-    let module = 'wrangler'
-    let fun = 'tuple_funpar'
-    let args = '["' . file . '", {' . a:start_line . ', ' . a:start_col . '}, {' . a:end_line . ', ' . a:end_col . '}, ["' . a:search_path . '"], ' . &sw . ']'
-    let result = s:send_rpc(module, fun, args)
-    if s:check_for_error(result)
-        return 0
-    endif
-    call s:send_confirm()
-    return 1
-endfunction
-
-function! ErlangTupleFunArgs(mode)
-    silent w!
-    let search_path = expand("%:p:h")
-    "let search_path = inputdialog('Search path: ', expand("%:p:h"))
-    if a:mode == "v"
-        let start_pos = getpos("'<")
-        let start_line = start_pos[1]
-        let start_col = start_pos[2]
-
-        let end_pos = getpos("'>")
-        let end_line = end_pos[1]
-        let end_col = end_pos[2]
-        if s:call_tuple_fun_args(start_line, start_col, end_line, end_col, search_path)
-            let temp = &autoread
-            set autoread
-            :e
-            if temp == 0
-                set noautoread
-            endif
-        endif
-    elseif a:mode == "n"
-        let pos = getpos(".")
-        let line = pos[1]
-        let col = pos[2]
-        if s:call_tuple_fun_args(line, col, line, col, search_path)
-            let temp = &autoread
-            set autoread
-            :e
-            if temp == 0
-                set noautoread
-            endif
-        endif
-    else
-        echo "Mode not supported."
-    endif
-endfunction
-nmap <A-r>t :call ErlangTupleFunArgs("n")<ENTER>
-vmap <A-r>t :call ErlangTupleFunArgs("v")<ENTER>
-
-" vim: set foldmethod=marker:

ftplugin/eruby.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+  
 " Vim filetype plugin
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -27,7 +29,7 @@ elseif !exists("b:eruby_subtype")
   let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
   let b:eruby_subtype = matchstr(s:lines,'eruby_subtype=\zs\w\+')
   if b:eruby_subtype == ''
-    let b:eruby_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.erb\|\.eruby\|\.erubis\)\+$','',''),'\.\zs\w\+$')
+    let b:eruby_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.erb\|\.eruby\|\.erubis\)\+$','',''),'\.\zs\w\+\%(\ze+\w\+\)\=$')
   endif
   if b:eruby_subtype == 'rhtml'
     let b:eruby_subtype = 'html'
@@ -100,3 +102,5 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: nowrap sw=2 sts=2 ts=8:
+
+endif

ftplugin/git.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
+  
 " Vim filetype plugin
 " Language:	generic git output
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -36,3 +38,5 @@ endif
 
 setlocal includeexpr=substitute(v:fname,'^[^/]\\+/','','')
 let b:undo_ftplugin = "setl keywordprg< path< includeexpr<"
+
+endif

ftplugin/gitcommit.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
+  
 " Vim filetype plugin
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -58,3 +60,5 @@ function! s:gitdiffcached(bang,gitdir,...)
   nnoremap <buffer> <silent> q :q<CR>
   setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git
 endfunction
+
+endif

ftplugin/gitconfig.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
+  
 " Vim filetype plugin
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -13,3 +15,5 @@ setlocal formatoptions-=t formatoptions+=croql
 setlocal comments=:#,:; commentstring=;\ %s
 
 let b:undo_ftplugin = "setl fo< com< cms<"
+
+endif

ftplugin/gitrebase.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
+  
 " Vim filetype plugin
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -41,3 +43,5 @@ endif
 nnoremap <buffer> <expr> K col('.') < 7 && expand('<Lt>cword>') =~ '\X' && getline('.') =~ '^\w\+\s\+\x\+\>' ? 'wK' : 'K'
 
 let b:undo_ftplugin = b:undo_ftplugin . "|nunmap <buffer> K"
+
+endif

ftplugin/gitsendemail.vim

@@ -1,6 +1,10 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
+  
 " Vim filetype plugin
 " Language:	git send-email message
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Last Change:	2009 Dec 24
 
 runtime! ftplugin/mail.vim
+
+endif

ftplugin/go.vim

@@ -1,19 +0,0 @@
-" Copyright 2013 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.
-"
-" go.vim: Vim filetype plugin for Go.
-
-if exists("b:did_ftplugin")
-    finish
-endif
-let b:did_ftplugin = 1
-
-setlocal formatoptions-=t
-
-setlocal comments=s1:/*,mb:*,ex:*/,://
-setlocal commentstring=//\ %s
-
-let b:undo_ftplugin = "setl fo< com< cms<"
-
-" vim:ts=4:sw=4:et

ftplugin/go/fmt.vim

@@ -1,69 +0,0 @@
-" 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.
-"
-" fmt.vim: Vim command to format Go files with gofmt.
-"
-" This filetype plugin add a new commands for go buffers:
-"
-"   :Fmt
-"
-"       Filter the current Go buffer through gofmt.
-"       It tries to preserve cursor position and avoids
-"       replacing the buffer with stderr output.
-"
-" Options:
-"
-"   g:go_fmt_commands [default=1]
-"
-"       Flag to indicate whether to enable the commands listed above.
-"
-"   g:gofmt_command [default="gofmt"]
-"
-"       Flag naming the gofmt executable to use.
-"
-if exists("b:did_ftplugin_go_fmt")
-    finish
-endif
-
-if !exists("g:go_fmt_commands")
-    let g:go_fmt_commands = 1
-endif
-
-if !exists("g:gofmt_command")
-    let g:gofmt_command = "gofmt"
-endif
-
-if g:go_fmt_commands
-    command! -buffer Fmt call s:GoFormat()
-endif
-
-function! s:GoFormat()
-    let view = winsaveview()
-    silent execute "%!" . g:gofmt_command
-    if v:shell_error
-        let errors = []
-        for line in getline(1, line('$'))
-            let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)')
-            if !empty(tokens)
-                call add(errors, {"filename": @%,
-                                 \"lnum":     tokens[2],
-                                 \"col":      tokens[3],
-                                 \"text":     tokens[4]})
-            endif
-        endfor
-        if empty(errors)
-            % | " Couldn't detect gofmt error format, output errors
-        endif
-        undo
-        if !empty(errors)
-            call setqflist(errors, 'r')
-        endif
-        echohl Error | echomsg "Gofmt returned error" | echohl None
-    endif
-    call winrestview(view)
-endfunction
-
-let b:did_ftplugin_go_fmt = 1
-
-" vim:ts=4:sw=4:et

ftplugin/go/import.vim

@@ -1,250 +0,0 @@
-" 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.
-"
-" import.vim: Vim commands to import/drop Go packages.
-"
-" This filetype plugin adds three new commands for go buffers:
-"
-"   :Import {path}
-"
-"       Import ensures that the provided package {path} is imported
-"       in the current Go buffer, using proper style and ordering.
-"       If {path} is already being imported, an error will be
-"       displayed and the buffer will be untouched.
-"
-"   :ImportAs {localname} {path}
-"
-"       Same as Import, but uses a custom local name for the package.
-"
-"   :Drop {path}
-"
-"       Remove the import line for the provided package {path}, if
-"       present in the current Go buffer.  If {path} is not being
-"       imported, an error will be displayed and the buffer will be
-"       untouched.
-"
-" If you would like to add shortcuts, you can do so by doing the following:
-"
-"   Import fmt
-"   au Filetype go nnoremap <buffer> <LocalLeader>f :Import fmt<CR>
-"
-"   Drop fmt
-"   au Filetype go nnoremap <buffer> <LocalLeader>F :Drop fmt<CR>
-"
-"   Import the word under your cursor
-"   au Filetype go nnoremap <buffer> <LocalLeader>k
-"       \ :exe 'Import ' . expand('<cword>')<CR>
-"
-" The backslash '\' is the default maplocalleader, so it is possible that
-" your vim is set to use a different character (:help maplocalleader).
-"
-" Options:
-"
-"   g:go_import_commands [default=1]
-"
-"       Flag to indicate whether to enable the commands listed above.
-"
-if exists("b:did_ftplugin_go_import")
-    finish
-endif
-
-if !exists("g:go_import_commands")
-    let g:go_import_commands = 1
-endif
-
-if g:go_import_commands
-    command! -buffer -nargs=? -complete=customlist,go#complete#Package Drop call s:SwitchImport(0, '', <f-args>)
-    command! -buffer -nargs=1 -complete=customlist,go#complete#Package Import call s:SwitchImport(1, '', <f-args>)
-    command! -buffer -nargs=* -complete=customlist,go#complete#Package ImportAs call s:SwitchImport(1, <f-args>)
-endif
-
-function! s:SwitchImport(enabled, localname, path)
-    let view = winsaveview()
-    let path = a:path
-
-    " Quotes are not necessary, so remove them if provided.
-    if path[0] == '"'
-        let path = strpart(path, 1)
-    endif
-    if path[len(path)-1] == '"'
-        let path = strpart(path, 0, len(path) - 1)
-    endif
-    if path == ''
-        call s:Error('Import path not provided')
-        return
-    endif
-
-    " Extract any site prefix (e.g. github.com/).
-    " If other imports with the same prefix are grouped separately,
-    " we will add this new import with them.
-    " Only up to and including the first slash is used.
-    let siteprefix = matchstr(path, "^[^/]*/")
-
-    let qpath = '"' . path . '"'
-    if a:localname != ''
-        let qlocalpath = a:localname . ' ' . qpath
-    else
-        let qlocalpath = qpath
-    endif
-    let indentstr = 0
-    let packageline = -1 " Position of package name statement
-    let appendline = -1  " Position to introduce new import
-    let deleteline = -1  " Position of line with existing import
-    let linesdelta = 0   " Lines added/removed
-
-    " Find proper place to add/remove import.
-    let line = 0
-    while line <= line('$')
-        let linestr = getline(line)
-
-        if linestr =~# '^package\s'
-            let packageline = line
-            let appendline = line
-
-        elseif linestr =~# '^import\s\+('
-            let appendstr = qlocalpath
-            let indentstr = 1
-            let appendline = line
-            let firstblank = -1
-            let lastprefix = ""
-            while line <= line("$")
-                let line = line + 1
-                let linestr = getline(line)
-                let m = matchlist(getline(line), '^\()\|\(\s\+\)\(\S*\s*\)"\(.\+\)"\)')
-                if empty(m)
-                    if siteprefix == "" && a:enabled
-                        " must be in the first group
-                        break
-                    endif
-                    " record this position, but keep looking
-                    if firstblank < 0
-                        let firstblank = line
-                    endif
-                    continue
-                endif
-                if m[1] == ')'
-                    " if there's no match, add it to the first group
-                    if appendline < 0 && firstblank >= 0
-                        let appendline = firstblank
-                    endif
-                    break
-                endif
-                let lastprefix = matchstr(m[4], "^[^/]*/")
-                if a:localname != '' && m[3] != ''
-                    let qlocalpath = printf('%-' . (len(m[3])-1) . 's %s', a:localname, qpath)
-                endif
-                let appendstr = m[2] . qlocalpath
-                let indentstr = 0
-                if m[4] == path
-                    let appendline = -1
-                    let deleteline = line
-                    break
-                elseif m[4] < path
-                    " don't set candidate position if we have a site prefix,
-                    " we've passed a blank line, and this doesn't share the same
-                    " site prefix.
-                    if siteprefix == "" || firstblank < 0 || match(m[4], "^" . siteprefix) >= 0
-                        let appendline = line
-                    endif
-                elseif siteprefix != "" && match(m[4], "^" . siteprefix) >= 0
-                    " first entry of site group
-                    let appendline = line - 1
-                    break
-                endif
-            endwhile
-            break
-
-        elseif linestr =~# '^import '
-            if appendline == packageline
-                let appendstr = 'import ' . qlocalpath
-                let appendline = line - 1
-            endif
-            let m = matchlist(linestr, '^import\(\s\+\)\(\S*\s*\)"\(.\+\)"')
-            if !empty(m)
-                if m[3] == path
-                    let appendline = -1
-                    let deleteline = line
-                    break
-                endif
-                if m[3] < path
-                    let appendline = line
-                endif
-                if a:localname != '' && m[2] != ''
-                    let qlocalpath = printf("%s %" . len(m[2])-1 . "s", a:localname, qpath)
-                endif
-                let appendstr = 'import' . m[1] . qlocalpath
-            endif
-
-        elseif linestr =~# '^\(var\|const\|type\|func\)\>'
-            break
-
-        endif
-        let line = line + 1
-    endwhile
-
-    " Append or remove the package import, as requested.
-    if a:enabled
-        if deleteline != -1
-            call s:Error(qpath . ' already being imported')
-        elseif appendline == -1
-            call s:Error('No package line found')
-        else
-            if appendline == packageline
-                call append(appendline + 0, '')
-                call append(appendline + 1, 'import (')
-                call append(appendline + 2, ')')
-                let appendline += 2
-                let linesdelta += 3
-                let appendstr = qlocalpath
-                let indentstr = 1
-            endif
-            call append(appendline, appendstr)
-            execute appendline + 1
-            if indentstr
-                execute 'normal >>'
-            endif
-            let linesdelta += 1
-        endif
-    else
-        if deleteline == -1
-            call s:Error(qpath . ' not being imported')
-        else
-            execute deleteline . 'd'
-            let linesdelta -= 1
-
-            if getline(deleteline-1) =~# '^import\s\+(' && getline(deleteline) =~# '^)'
-                " Delete empty import block
-                let deleteline -= 1
-                execute deleteline . "d"
-                execute deleteline . "d"
-                let linesdelta -= 2
-            endif
-
-            if getline(deleteline) == '' && getline(deleteline - 1) == ''
-                " Delete spacing for removed line too.
-                execute deleteline . "d"
-                let linesdelta -= 1
-            endif
-        endif
-    endif
-
-    " Adjust view for any changes.
-    let view.lnum += linesdelta
-    let view.topline += linesdelta
-    if view.topline < 0
-        let view.topline = 0
-    endif
-
-    " Put buffer back where it was.
-    call winrestview(view)
-
-endfunction
-
-function! s:Error(s)
-    echohl Error | echo a:s | echohl None
-endfunction
-
-let b:did_ftplugin_go_import = 1
-
-" vim:ts=4:sw=4:et

ftplugin/haml.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
+  
 " Vim filetype plugin
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -66,3 +68,5 @@ let b:undo_ftplugin = "setl cms< com< "
 let &cpo = s:save_cpo
 
 " vim:set sw=2:
+
+endif

ftplugin/html.vim

@@ -1,7 +1,11 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+  
 " Maintainer:  	othree <othree@gmail.com>
 " URL:		      http://github.com/othree/html5.vim
 " Last Change:  2014-05-02
 " License:      MIT
 " Changes:      Add - to keyword
 
-setlocal iskeyword+=-
+" setlocal iskeyword+=-
+
+endif

ftplugin/jade.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jade') == -1
+  
 " Vim filetype plugin
 " Language: Jade
 " Maintainer: Joshua Borton
@@ -11,6 +13,8 @@ endif
 let s:save_cpo = &cpo
 set cpo-=C
 
+setlocal iskeyword+=-
+
 " Define some defaults in case the included ftplugins don't set them.
 let s:undo_ftplugin = ""
 let s:browsefilter = "All Files (*.*)\t*.*\n"
@@ -53,3 +57,5 @@ let b:undo_ftplugin = "setl cms< com< "
 let &cpo = s:save_cpo
 
 " vim:set sw=2:
+
+endif

ftplugin/latex-box/common.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
+  
 " LaTeX Box common functions
 
 " Error Format {{{
@@ -64,14 +66,24 @@ setlocal efm+=%-G%.%#
 
 " Vim Windows {{{
 
-" Width of vertical splits
+" Type of split, "new" for horiz. "vnew" for vert.
+if !exists('g:LatexBox_split_type')
+	let g:LatexBox_split_type = "vnew"
+endif
+
+" Length of vertical splits
+if !exists('g:LatexBox_split_length')
+	let g:LatexBox_split_length = 15
+endif
+
+" Width of horizontal splits
 if !exists('g:LatexBox_split_width')
 	let g:LatexBox_split_width = 30
 endif
 
-" Where vertical splits appear
+" Where splits appear
 if !exists('g:LatexBox_split_side')
-	let g:LatexBox_split_side = "leftabove"
+	let g:LatexBox_split_side = "aboveleft"
 endif
 
 " Resize when split?
@@ -169,7 +181,13 @@ function! LatexBox_GetTexRoot()
 	return fnamemodify(LatexBox_GetMainTexFile(), ':h')
 endfunction
 
-function! LatexBox_GetTexBasename(with_dir)
+function! LatexBox_GetBuildBasename(with_dir)
+	" 1. Check for g:LatexBox_jobname
+	if exists('g:LatexBox_jobname')
+		return g:LatexBox_jobname
+	endif
+
+	" 2. Get the basename from the main tex file
 	if a:with_dir
 		return fnamemodify(LatexBox_GetMainTexFile(), ':r')
 	else
@@ -180,48 +198,48 @@ endfunction
 function! LatexBox_GetAuxFile()
 	" 1. check for b:build_dir variable
 	if exists('b:build_dir') && isdirectory(b:build_dir)
-		return b:build_dir . '/' . LatexBox_GetTexBasename(0) . '.aux'
+		return b:build_dir . '/' . LatexBox_GetBuildBasename(0) . '.aux'
 	endif
 
 	" 2. check for g:LatexBox_build_dir variable
 	if exists('g:LatexBox_build_dir') && isdirectory(g:LatexBox_build_dir)
-		return g:LatexBox_build_dir . '/' . LatexBox_GetTexBasename(0) . '.aux'
+		return g:LatexBox_build_dir . '/' . LatexBox_GetBuildBasename(0) . '.aux'
 	endif
 
 	" 3. use the base name of main tex file
-	return LatexBox_GetTexBasename(1) . '.aux'
+	return LatexBox_GetBuildBasename(1) . '.aux'
 endfunction
 
 function! LatexBox_GetLogFile()
 	" 1. check for b:build_dir variable
 	if exists('b:build_dir') && isdirectory(b:build_dir)
-		return b:build_dir . '/' . LatexBox_GetTexBasename(0) . '.log'
+		return b:build_dir . '/' . LatexBox_GetBuildBasename(0) . '.log'
 	endif
 
 	" 2. check for g:LatexBox_build_dir variable
 	if exists('g:LatexBox_build_dir') && isdirectory(g:LatexBox_build_dir)
-		return g:LatexBox_build_dir . '/' . LatexBox_GetTexBasename(0) . '.log'
+		return g:LatexBox_build_dir . '/' . LatexBox_GetBuildBasename(0) . '.log'
 	endif
 
 	" 3. use the base name of main tex file
-	return LatexBox_GetTexBasename(1) . '.log'
+	return LatexBox_GetBuildBasename(1) . '.log'
 endfunction
 
 function! LatexBox_GetOutputFile()
 	" 1. check for b:build_dir variable
 	if exists('b:build_dir') && isdirectory(b:build_dir)
-		return b:build_dir . '/' . LatexBox_GetTexBasename(0)
+		return b:build_dir . '/' . LatexBox_GetBuildBasename(0)
 					\ . '.' . g:LatexBox_output_type
 	endif
 
 	" 2. check for g:LatexBox_build_dir variable
 	if exists('g:LatexBox_build_dir') && isdirectory(g:LatexBox_build_dir)
-		return g:LatexBox_build_dir . '/' . LatexBox_GetTexBasename(0)
+		return g:LatexBox_build_dir . '/' . LatexBox_GetBuildBasename(0)
 					\ . '.' . g:LatexBox_output_type
 	endif
 
 	" 3. use the base name of main tex file
-	return LatexBox_GetTexBasename(1) . '.' . g:LatexBox_output_type
+	return LatexBox_GetBuildBasename(1) . '.' . g:LatexBox_output_type
 endfunction
 " }}}
 
@@ -229,12 +247,18 @@ endfunction
 
 " Default pdf viewer
 if !exists('g:LatexBox_viewer')
-	if has('win32')
+	" On windows, 'running' a file will open it with the default program
-		" On windows, 'running' a file will open it with the default program
+	let s:viewer = ''
-		let g:LatexBox_viewer = ''
+	if has('unix')
-	else
+	  " echo -n necessary as uname -s will append \n otherwise
-		let g:LatexBox_viewer = 'xdg-open'
+      let s:uname = system('echo -n $(uname -s)')
+	  if s:uname == "Darwin"
+		  let s:viewer = 'open'
+	  else
+		  let s:viewer = 'xdg-open'
+	  endif
 	endif
+	let g:LatexBox_viewer = s:viewer
 endif
 
 function! LatexBox_View(...)
@@ -248,7 +272,12 @@ function! LatexBox_View(...)
 	if has('win32')
 		let cmd = '!start /b ' . cmd . ' >nul'
 	else
-		let cmd = '!' . cmd . ' &>/dev/null &'
+		let cmd = '!' . cmd . ' '
+		if fnamemodify(&shell, ':t') ==# 'fish'
+			let cmd .= ' >/dev/null ^/dev/null &'
+		else
+			let cmd .= ' &>/dev/null &'
+		endif
 	endif
 	silent execute cmd
 	if !has("gui_running")
@@ -384,3 +413,5 @@ endfunction
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+
+endif

ftplugin/latex-box/complete.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
+  
 " LaTeX Box completion
 
 setlocal omnifunc=LatexBox_Complete
@@ -24,7 +26,7 @@ if !exists('g:LatexBox_cite_pattern')
 	let g:LatexBox_cite_pattern = '\C\\\a*cite\a*\*\?\(\[[^\]]*\]\)*\_\s*{'
 endif
 if !exists('g:LatexBox_ref_pattern')
-	let g:LatexBox_ref_pattern = '\C\\v\?\(eq\|page\|[cC]\|labelc\)\?ref\*\?\_\s*{'
+	let g:LatexBox_ref_pattern = '\C\\v\?\(eq\|page\|[cC]\|labelc\|name\|auto\)\?ref\*\?\_\s*{'
 endif
 
 if !exists('g:LatexBox_completion_environments')
@@ -255,14 +257,14 @@ function! LatexBox_BibSearch(regexp)
 		if has('win32')
 			let l:old_shellslash = &l:shellslash
 			setlocal noshellslash
-			silent execute '! cd ' shellescape(LatexBox_GetTexRoot()) .
+			call system('cd ' . shellescape(LatexBox_GetTexRoot()) .
 						\ ' & bibtex -terse '
-						\ . fnamemodify(auxfile, ':t') . ' >nul'
+						\ . fnamemodify(auxfile, ':t') . ' >nul')
 			let &l:shellslash = l:old_shellslash
 		else
-			silent execute '! cd ' shellescape(LatexBox_GetTexRoot()) .
+			call system('cd ' . shellescape(LatexBox_GetTexRoot()) .
 						\ ' ; bibtex -terse '
-						\ . fnamemodify(auxfile, ':t') . ' >/dev/null'
+						\ . fnamemodify(auxfile, ':t') . ' >/dev/null')
 		endif
 
 		let lines = split(substitute(join(readfile(bblfile), "\n"),
@@ -367,6 +369,7 @@ function! s:ExtractLabels()
 
 		" Ignore cref entries (because they are duplicates)
 		if curname =~# "@cref$"
+		    let [lblline, lblbegin] = searchpos( '\\newlabel{', 'ecW' )
 			continue
 		endif
 
@@ -458,7 +461,8 @@ function! s:GetLabelCache(file)
 
 	if !has_key(s:LabelCache , a:file) || s:LabelCache[a:file][0] != getftime(a:file)
 		" Open file in temporary split window for label extraction.
-		silent execute '1sp +let\ labels=s:ExtractLabels()|let\ inputs=s:ExtractInputs()|quit! ' . fnameescape(a:file)
+		let main_tex_file = LatexBox_GetMainTexFile()
+		silent execute '1sp +let\ b:main_tex_file=main_tex_file|let\ labels=s:ExtractLabels()|let\ inputs=s:ExtractInputs()|quit! ' . fnameescape(a:file)
 		let s:LabelCache[a:file] = [ getftime(a:file), labels, inputs ]
 	endif
 
@@ -928,3 +932,5 @@ command! LatexLabels call <SID>PromptLabelList()
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+
+endif

ftplugin/latex-box/findmain.vim

@@ -1,3 +1,5 @@
+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
@@ -30,7 +32,7 @@ function! LatexBox_GetMainFileName(...)
 	" move up the directory tree until we find a .latexmain file.
 	" TODO: Should we be doing this recursion by default, or should there be a
 	"       setting?
-	while glob('*.latexmain') == ''
+	while glob('*.latexmain',1) == ''
 		let dirmodifier = dirmodifier.':h'
 		let dirNew = fnameescape(expand(dirmodifier))
 		" break from the loop if we cannot go up any further.
@@ -41,7 +43,7 @@ function! LatexBox_GetMainFileName(...)
 		exe 'cd '.dirLast
 	endwhile
 
-	let lheadfile = glob('*.latexmain')
+	let lheadfile = glob('*.latexmain',1)
 	if lheadfile != ''
 		" Remove the trailing .latexmain part of the filename... We never want
 		" that.
@@ -60,3 +62,5 @@ function! LatexBox_GetMainFileName(...)
 	"       certain platforms.
 	return lheadfile
 endfunction
+
+endif

ftplugin/latex-box/folding.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
+  
 " Folding support for LaTeX
 
 "
@@ -75,8 +77,8 @@ if g:LatexBox_fold_automatic == 1
 	"
 	augroup FastFold
 		autocmd!
-		autocmd InsertEnter *.tex setlocal foldmethod=manual
+		autocmd InsertEnter *.tex if !&diff | setlocal foldmethod=manual | endif
-		autocmd InsertLeave *.tex setlocal foldmethod=expr
+		autocmd InsertLeave *.tex if !&diff | setlocal foldmethod=expr | endif
 	augroup end
 else
 	setl foldmethod=manual
@@ -156,7 +158,7 @@ let s:notcomment = '\%(\%(\\\@<!\%(\\\\\)*\)\@<=%.*\)\@<!'
 let s:envbeginpattern = s:notcomment . s:notbslash . '\\begin\s*{.\{-}}'
 let s:envendpattern = s:notcomment . s:notbslash . '\\end\s*{.\{-}}'
 let s:foldparts = '^\s*\\\%(' . join(g:LatexBox_fold_parts, '\|') . '\)'
-let s:folded = '\(% Fake\|\\\(document\|begin\|end\|'
+let s:folded = '\(% Fake\|\\\(document\|begin\|end\|paragraph\|'
             \ . 'front\|main\|back\|app\|sub\|section\|chapter\|part\)\)'
 
 function! LatexBox_FoldLevel(lnum)
@@ -193,26 +195,31 @@ function! LatexBox_FoldLevel(lnum)
     endif
 
     " Fold environments
-    if line =~# s:envbeginpattern
+    if line =~# s:envbeginpattern && line =~# s:envendpattern
-        if g:LatexBox_fold_envs == 1
+        " If the begin and end pattern are on the same line , do not fold
-            return "a1"
+        return "="
-        else
+    else
-            let env = matchstr(line,'\\begin\*\?{\zs\w*\*\?\ze}')
+        if line =~# s:envbeginpattern
-            if index(g:LatexBox_fold_envs_force, env) >= 0
+            if g:LatexBox_fold_envs == 1
                 return "a1"
             else
-                return "="
+                let env = matchstr(line,'\\begin\*\?{\zs\w*\*\?\ze}')
+                if index(g:LatexBox_fold_envs_force, env) >= 0
+                    return "a1"
+                else
+                    return "="
+                endif
             endif
-        endif
+        elseif line =~# s:envendpattern
-    elseif line =~# s:envendpattern
+            if g:LatexBox_fold_envs == 1
-        if g:LatexBox_fold_envs == 1
-            return "s1"
-        else
-            let env = matchstr(line,'\\end\*\?{\zs\w*\*\?\ze}')
-            if index(g:LatexBox_fold_envs_force, env) >= 0
                 return "s1"
             else
-                return "="
+                let env = matchstr(line,'\\end\*\?{\zs\w*\*\?\ze}')
+                if index(g:LatexBox_fold_envs_force, env) >= 0
+                    return "s1"
+                else
+                    return "="
+                endif
             endif
         endif
     endif
@@ -288,7 +295,7 @@ function! LatexBox_FoldText_title()
     endif
 
     " Parts, sections and fakesections
-    let sections = '\(\(sub\)*section\|part\|chapter\)'
+    let sections = '\(\(sub\)*\(section\|paragraph\)\|part\|chapter\)'
     let secpat1 = '^\s*\\' . sections . '\*\?\s*{'
     let secpat2 = '^\s*\\' . sections . '\*\?\s*\['
     if line =~ '\\frontmatter'
@@ -371,3 +378,5 @@ endfunction
 
 " {{{1 Footer
 " vim:fdm=marker:ff=unix:ts=4:sw=4
+
+endif

ftplugin/latex-box/latexmk.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
+  
 " LaTeX Box latexmk functions
 
 " Options and variables {{{
@@ -23,6 +25,9 @@ endif
 if ! exists('g:LatexBox_quickfix')
 	let g:LatexBox_quickfix = 1
 endif
+if ! exists('g:LatexBox_personal_latexmkrc')
+	let g:LatexBox_personal_latexmkrc = 0
+endif
 
 " }}}
 
@@ -138,7 +143,7 @@ endfunction
 
 function! LatexBox_Latexmk(force)
 	" Define often used names
-	let basepath = LatexBox_GetTexBasename(1)
+	let basepath = LatexBox_GetBuildBasename(1)
 	let basename = fnamemodify(basepath, ':t')
 	let texroot = shellescape(LatexBox_GetTexRoot())
 	let mainfile = fnameescape(fnamemodify(LatexBox_GetMainTexFile(), ':t'))
@@ -163,7 +168,11 @@ function! LatexBox_Latexmk(force)
 	elseif match(&shell, '/tcsh$') >= 0
 		let env = 'setenv max_print_line ' . max_print_line . '; '
 	else
-		let env = 'max_print_line=' . max_print_line
+		if fnamemodify(&shell, ':t') ==# 'fish'
+			let env = 'set max_print_line ' . max_print_line . '; and '
+		else
+			let env = 'max_print_line=' . max_print_line
+		endif
 	endif
 
 	" Set environment options
@@ -174,10 +183,16 @@ function! LatexBox_Latexmk(force)
 		" Make sure to switch drive as well as directory
 		let cmd = 'cd /D ' . texroot . ' && '
 	else
-		let cmd = 'cd ' . texroot . ' && '
+		if fnamemodify(&shell, ':t') ==# 'fish'
+			let cmd = 'cd ' . texroot . '; and '
+		else
+			let cmd = 'cd ' . texroot . ' && '
+		endif
 	endif
 	let cmd .= env . ' latexmk'
-	let cmd .= ' -' . g:LatexBox_output_type
+	if ! g:LatexBox_personal_latexmkrc
+		let cmd .= ' -' . g:LatexBox_output_type
+	endif
 	let cmd .= ' -quiet '
 	let cmd .= g:LatexBox_latexmk_options
 	if a:force
@@ -198,7 +213,11 @@ function! LatexBox_Latexmk(force)
 	if has('win32')
 		let cmd .= ' >nul'
 	else
-		let cmd .= ' &>/dev/null'
+		if fnamemodify(&shell, ':t') ==# 'fish'
+			let cmd .= ' >/dev/null ^/dev/null'
+		else
+			let cmd .= ' &>/dev/null'
+		endif
 	endif
 
 	if g:LatexBox_latexmk_async
@@ -352,7 +371,7 @@ function! LatexBox_LatexmkClean(cleanall)
 		return
 	endif
 
-	let basename = LatexBox_GetTexBasename(1)
+	let basename = LatexBox_GetBuildBasename(1)
 
 	if has_key(g:latexmk_running_pids, basename)
 		echomsg "don't clean when latexmk is running"
@@ -438,10 +457,32 @@ function! LatexBox_LatexErrors(status, ...)
 	endif
 endfunction
 
+" Redefine uniq() for compatibility with older Vim versions (< 7.4.218)
+function! s:uniq(list)
+        if exists('*uniq')
+                return uniq(a:list)
+        elseif len(a:list) <= 1
+                return a:list
+        endif
+
+        let last_element = get(a:list,0)
+        let uniq_list = [last_element]
+
+        for i in range(1, len(a:list)-1)
+                let next_element = get(a:list, i)
+                if last_element == next_element
+                        continue
+                endif
+                let last_element = next_element
+                call add(uniq_list, next_element)
+        endfor
+        return uniq_list
+endfunction
+
 function! s:log_contains_error(file)
 	let lines = readfile(a:file)
 	let lines = filter(lines, 'v:val =~ ''^.*:\d\+: ''')
-	let lines = uniq(map(lines, 'matchstr(v:val, ''^.*\ze:\d\+:'')'))
+	let lines = s:uniq(map(lines, 'matchstr(v:val, ''^.*\ze:\d\+:'')'))
 	let lines = filter(lines, 'filereadable(fnameescape(v:val))')
 	return len(lines) > 0
 endfunction
@@ -463,7 +504,7 @@ function! LatexBox_LatexmkStatus(detailed)
 			echo "latexmk is running (" . plist . ")"
 		endif
 	else
-		let basename = LatexBox_GetTexBasename(1)
+		let basename = LatexBox_GetBuildBasename(1)
 		if has_key(g:latexmk_running_pids, basename)
 			echo "latexmk is running"
 		else
@@ -477,12 +518,12 @@ endfunction
 function! LatexBox_LatexmkStop(silent)
 	if empty(g:latexmk_running_pids)
 		if !a:silent
-			let basepath = LatexBox_GetTexBasename(1)
+			let basepath = LatexBox_GetBuildBasename(1)
 			let basename = fnamemodify(basepath, ':t')
 			echoerr "latexmk is not running for `" . basename . "'"
 		endif
 	else
-		let basepath = LatexBox_GetTexBasename(1)
+		let basepath = LatexBox_GetBuildBasename(1)
 		let basename = fnamemodify(basepath, ':t')
 		if has_key(g:latexmk_running_pids, basepath)
 			call s:kill_latexmk_process(g:latexmk_running_pids[basepath])
@@ -513,3 +554,5 @@ endif
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+
+endif

ftplugin/latex-box/mappings.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
+  
 " LaTeX Box mappings
 
 if exists("g:LatexBox_no_mappings")
@@ -5,31 +7,31 @@ if exists("g:LatexBox_no_mappings")
 endif
 
 " latexmk {{{
-map <buffer> <LocalLeader>ll :Latexmk<CR>
+noremap <buffer> <LocalLeader>ll :Latexmk<CR>
-map <buffer> <LocalLeader>lL :Latexmk!<CR>
+noremap <buffer> <LocalLeader>lL :Latexmk!<CR>
-map <buffer> <LocalLeader>lc :LatexmkClean<CR>
+noremap <buffer> <LocalLeader>lc :LatexmkClean<CR>
-map <buffer> <LocalLeader>lC :LatexmkClean!<CR>
+noremap <buffer> <LocalLeader>lC :LatexmkClean!<CR>
-map <buffer> <LocalLeader>lg :LatexmkStatus<CR>
+noremap <buffer> <LocalLeader>lg :LatexmkStatus<CR>
-map <buffer> <LocalLeader>lG :LatexmkStatus!<CR>
+noremap <buffer> <LocalLeader>lG :LatexmkStatus!<CR>
-map <buffer> <LocalLeader>lk :LatexmkStop<CR>
+noremap <buffer> <LocalLeader>lk :LatexmkStop<CR>
-map <buffer> <LocalLeader>le :LatexErrors<CR>
+noremap <buffer> <LocalLeader>le :LatexErrors<CR>
 " }}}
 
 " View {{{
-map <buffer> <LocalLeader>lv :LatexView<CR>
+noremap <buffer> <LocalLeader>lv :LatexView<CR>
 " }}}
 
 " TOC {{{
-map <silent> <buffer> <LocalLeader>lt :LatexTOC<CR>
+noremap <silent> <buffer> <LocalLeader>lt :LatexTOC<CR>
 " }}}
 
 " List of labels {{{
-map <silent> <buffer> <LocalLeader>lj :LatexLabels<CR>
+noremap <silent> <buffer> <LocalLeader>lj :LatexLabels<CR>
 " }}}
 
 " Folding {{{
 if g:LatexBox_Folding == 1
-	map <buffer> <LocalLeader>lf :LatexFold<CR>
+	noremap <buffer> <LocalLeader>lf :LatexFold<CR>
 endif
 " }}}
 
@@ -44,12 +46,12 @@ endif
 " Define text objects {{{
 vmap <buffer> ie <Plug>LatexBox_SelectCurrentEnvInner
 vmap <buffer> ae <Plug>LatexBox_SelectCurrentEnvOuter
-omap <buffer> ie :normal vie<CR>
+onoremap <buffer> ie :normal vie<CR>
-omap <buffer> ae :normal vae<CR>
+onoremap <buffer> ae :normal vae<CR>
 vmap <buffer> i$ <Plug>LatexBox_SelectInlineMathInner
 vmap <buffer> a$ <Plug>LatexBox_SelectInlineMathOuter
-omap <buffer> i$ :normal vi$<CR>
+onoremap <buffer> i$ :normal vi$<CR>
-omap <buffer> a$ :normal va$<CR>
+onoremap <buffer> a$ :normal va$<CR>
 " }}}
 
 " Jump between sections {{{
@@ -104,3 +106,5 @@ vnoremap <buffer> <silent> [[ :<c-u>call <SID>LatexBoxNextSection(0,1,1)<CR>
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+
+endif

ftplugin/latex-box/motion.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
+  
 " LaTeX Box motion functions
 
 " Motion options {{{
@@ -349,7 +351,7 @@ function! s:ReadTOC(auxfile, texfile, ...)
 		if len(tree) > 3 && empty(tree[1])
 			call remove(tree, 1)
 		endif
-		if len(tree) > 1 && tree[0] =~ '^\\\(numberline\|tocsection\)'
+		if len(tree) > 1 && type(tree[0]) == type("") && tree[0] =~ '^\\\(\(chapter\)\?numberline\|tocsection\)'
 			let secnum = LatexBox_TreeToTex(tree[1])
 			let secnum = substitute(secnum, '\\\S\+\s', '', 'g')
 			let secnum = substitute(secnum, '\\\S\+{\(.\{-}\)}', '\1', 'g')
@@ -359,7 +361,7 @@ function! s:ReadTOC(auxfile, texfile, ...)
 		" parse section title
 		let text = LatexBox_TreeToTex(tree)
 		let text = substitute(text, '^{\+\|}\+$',                 '', 'g')
-		let text = substitute(text, '\m^\\\(no\)\?numberline\s*', '', '')
+		let text = substitute(text, '\m^\\\(no\)\?\(chapter\)\?numberline\s*', '', '')
 		let text = substitute(text, '\*',                         '', 'g')
 
 		" add TOC entry
@@ -379,6 +381,21 @@ function! LatexBox_TOC(...)
 
 	" Check if window already exists
 	let winnr = bufwinnr(bufnr('LaTeX TOC'))
+	" Two types of splits, horizontal and vertical
+	let l:hori = "new"
+	let l:vert = "vnew"
+
+	" Set General Vars and initialize size
+	let l:type = g:LatexBox_split_type
+	let l:size = 10
+
+	" Size detection
+	if l:type == l:hori
+	  let l:size = g:LatexBox_split_length
+	elseif l:type == l:vert
+	  let l:size = g:LatexBox_split_width
+	endif
+
 	if winnr >= 0
 		if a:0 == 0
 			silent execute winnr . 'wincmd w'
@@ -386,13 +403,12 @@ function! LatexBox_TOC(...)
 			" Supplying an argument to this function causes toggling instead
 			" of jumping to the TOC window
 			if g:LatexBox_split_resize
-				silent exe "set columns-=" . g:LatexBox_split_width
+				silent exe "set columns-=" . l:size
 			endif
 			silent execute 'bwipeout' . bufnr('LaTeX TOC')
 		endif
 		return
 	endif
-
 	" Read TOC
 	let [toc, fileindices] = s:ReadTOC(LatexBox_GetAuxFile(),
 									 \ LatexBox_GetMainTexFile())
@@ -403,9 +419,10 @@ function! LatexBox_TOC(...)
 
 	" Create TOC window and set local settings
 	if g:LatexBox_split_resize
-		silent exe "set columns+=" . g:LatexBox_split_width
+		silent exe "set columns+=" . l:size
 	endif
-	silent exe g:LatexBox_split_side g:LatexBox_split_width . 'vnew LaTeX\ TOC'
+	silent exe g:LatexBox_split_side l:size . l:type . ' LaTeX\ TOC'
+
 	let b:toc = toc
 	let b:toc_numbers = 1
 	let b:calling_win = bufwinnr(calling_buf)
@@ -527,3 +544,5 @@ command! LatexTOCToggle call LatexBox_TOC(1)
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
+
+endif

ftplugin/latextoc.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
+  
 " {{{1 Settings
 setlocal buftype=nofile
 setlocal bufhidden=wipe
@@ -87,8 +89,12 @@ function! s:TOCActivate(close)
     endfor
 
     " Find section in buffer (or inputted files)
-    call s:TOCFindMatch('\\' . entry['level'] . '\_\s*{' . titlestr . '}',
+    if entry['level'] == 'label'
-                \ duplicates, files)
+        let re = '\(\\label\_\s*{\|label\s*=\s*\)' . titlestr . '\>'
+    else
+        let re = '\\' . entry['level'] . '\_\s*{' . titlestr . '}'
+    endif
+    call s:TOCFindMatch(re, duplicates, files)
 
     if a:close
         if g:LatexBox_split_resize
@@ -196,3 +202,5 @@ nnoremap <buffer> <silent> <Esc>OD h
 " }}}1
 
 " vim:fdm=marker:ff=unix:et:ts=4:sw=4
+
+endif

ftplugin/less.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
+  
 " Vim filetype plugin
 " Language:	    LessCSS
 " Author:	    Tim Pope <vimNOSPAM@tpope.org>
@@ -13,13 +15,16 @@ let b:did_ftplugin = 1
 let b:undo_ftplugin = "setl cms< def< inc< inex< ofu< sua<"
 
 setlocal iskeyword+=-
-setlocal commentstring=//\ %s
+setlocal commentstring=//%s
 setlocal define=^\\s*\\%(@mixin\\\|=\\)
 setlocal includeexpr=substitute(v:fname,'\\%(.*/\\\|^\\)\\zs','_','')
 setlocal omnifunc=csscomplete#CompleteCSS
 setlocal suffixesadd=.less
-setlocal comments=s1:/*,mb:*,ex:*/
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,://
+setlocal fo=croql
 
 let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='
 
 " vim:set sw=2:
+
+endif

ftplugin/liquid.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
+  
 " Vim filetype plugin
 " Language:     Liquid
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
@@ -59,3 +61,5 @@ endif
 setlocal commentstring={%\ comment\ %}%s{%\ endcomment\ %}
 
 let b:undo_ftplugin .= 'setl cms< | unlet! b:browsefilter b:match_words'
+
+endif

ftplugin/markdown.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
+  
 " Vim filetype plugin
 " Language:		Markdown
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -48,3 +50,5 @@ if has("folding") && exists("g:markdown_folding")
 endif
 
 " vim:set sw=2:
+
+endif

ftplugin/mustache.vim

@@ -1,3 +1,10 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
+  
+if exists('g:loaded_mustache_handlebars') && g:loaded_mustache_handlebars
+  finish
+endif
+let g:loaded_mustache_handlebars = 1
+
 let s:cpo_save = &cpo
 set cpo&vim
 
@@ -113,3 +120,5 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nofoldenable
+
+endif

ftplugin/ocaml.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
+  
 " Language:    OCaml
 " Maintainer:  David Baelde        <firstname.name@ens-lyon.org>
 "              Mike Leary          <leary@nwlink.com>
@@ -503,3 +505,5 @@ let &cpoptions=s:cposet
 unlet s:cposet
 
 " vim:sw=2
+
+endif

ftplugin/opencl.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
+  
 if exists("b:did_ftplugin") | finish | endif
 
 if version > 600
@@ -13,3 +15,5 @@ setlocal smarttab
 setlocal smartindent
 
 let b:did_ftplugin = 1
+
+endif

ftplugin/perl.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
+  
 " Vim filetype plugin file
 " Language:      Perl
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -77,7 +79,7 @@ endif
 "---------------------------------------------
 
 " Undo the stuff we changed.
-let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< kp< path<" .
+let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isk< isf< kp< path<" .
 	    \	      " | unlet! b:browsefilter"
 
 " proper matching for matchit plugin
@@ -87,3 +89,5 @@ let b:match_words = '\<if\>:\<elsif\>:\<else\>'
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
+
+endif

ftplugin/perl6.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
+  
 " Vim filetype plugin file
 " Language:      Perl 6
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -20,7 +22,7 @@ setlocal formatoptions-=t
 setlocal formatoptions+=crqol
 setlocal keywordprg=p6doc
 
-setlocal comments=:#
+setlocal comments=:#\|,:#=,:#
 setlocal commentstring=#%s
 
 " Change the browse dialog on Win32 to show mainly Perl-related files
@@ -43,7 +45,7 @@ setlocal define=[^A-Za-z_]
 " after/ftplugin/perl6.vim file that contains
 "       set isfname-=:
 set isfname+=:
-setlocal iskeyword=48-57,_,A-Z,a-z,:,-
+setlocal iskeyword=@,48-57,_,192-255,-
 
 " Set this once, globally.
 if !exists("perlpath")
@@ -65,13 +67,26 @@ if !exists("perlpath")
     endif
 endif
 
-let &l:path=perlpath
+" Append perlpath to the existing path value, if it is set.  Since we don't
+" use += to do it because of the commas in perlpath, we have to handle the
+" global / local settings, too.
+if &l:path == ""
+    if &g:path == ""
+        let &l:path=perlpath
+    else
+        let &l:path=&g:path.",".perlpath
+    endif
+else
+    let &l:path=&l:path.",".perlpath
+endif
 "---------------------------------------------
 
 " Undo the stuff we changed.
-let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isk<" .
+let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< isk< kp< path<" .
         \         " | unlet! b:browsefilter"
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
+
+endif

ftplugin/ps1.vim

@@ -0,0 +1,38 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
+  
+" Vim filetype plugin file
+" Language:           Windows PowerShell
+" Maintainer:         Peter Provost <peter@provost.org>
+" Version:            2.10
+" Project Repository: https://github.com/PProvost/vim-ps1
+" Vim Script Page:    http://www.vim.org/scripts/script.php?script_id=1327
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin") | finish | endif
+
+" Don't load another plug-in for this buffer
+let b:did_ftplugin = 1
+
+setlocal tw=0
+setlocal commentstring=#%s
+setlocal formatoptions=tcqro
+" Enable autocompletion of hyphenated PowerShell commands,
+" e.g. Get-Content or Get-ADUser
+setlocal iskeyword+=-
+
+" Change the browse dialog on Win32 to show mainly PowerShell-related files
+if has("gui_win32")
+	let b:browsefilter =
+				\ "All PowerShell Files (*.ps1, *.psd1, *.psm1, *.ps1xml)\t*.ps1;*.psd1;*.psm1;*.ps1xml\n" .
+				\ "PowerShell Script Files (*.ps1)\t*.ps1\n" .
+				\ "PowerShell Module Files (*.psd1, *.psm1)\t*.psd1;*.psm1\n" .
+				\ "PowerShell XML Files (*.ps1xml)\t*.ps1xml\n" .
+				\ "All Files (*.*)\t*.*\n"
+endif
+
+" Undo the stuff we changed
+let b:undo_ftplugin = "setlocal tw< cms< fo<" .
+			\ " | unlet! b:browsefilter"
+
+
+endif

ftplugin/ps1xml.vim

@@ -0,0 +1,35 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
+  
+" Vim filetype plugin file
+" Language:           Windows PowerShell
+" Maintainer:         Peter Provost <peter@provost.org>
+" Version:            2.10
+" Project Repository: https://github.com/PProvost/vim-ps1
+" Vim Script Page:    http://www.vim.org/scripts/script.php?script_id=1327
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin") | finish | endif
+
+" Don't load another plug-in for this buffer
+let b:did_ftplugin = 1
+
+setlocal tw=0
+setlocal commentstring=#%s
+setlocal formatoptions=tcqro
+
+" Change the browse dialog on Win32 to show mainly PowerShell-related files
+if has("gui_win32")
+  let b:browsefilter = 
+        \ "All PowerShell Files (*.ps1, *.psd1, *.psm1, *.ps1xml)\t*.ps1;*.psd1;*.psm1;*.ps1xml\n" .
+        \ "PowerShell Script Files (*.ps1)\t*.ps1\n" .
+        \ "PowerShell Module Files (*.psd1, *.psm1)\t*.psd1;*.psm1\n" .
+        \ "PowerShell XML Files (*.ps1xml)\t*.ps1xml\n" .
+        \ "All Files (*.*)\t*.*\n"
+endif
+
+" Undo the stuff we changed
+let b:undo_ftplugin = "setlocal tw< cms< fo<" .
+      \ " | unlet! b:browsefilter"
+
+
+endif

ftplugin/puppet.vim

@@ -1,6 +1,10 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
+  
 setl ts=2
 setl sts=2
 setl sw=2
 setl et
 setl keywordprg=puppet\ describe\ --providers
 setl iskeyword=-,:,@,48-57,_,192-255
+
+endif

ftplugin/r.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
+  
 " ftplugin for R files
 "
 " Author: Iago Mosqueira <i.mosqueira@ic.ac.uk>
@@ -67,3 +69,5 @@ inoremap <M-Enter> <Esc>:execute line(".") 'w >> ~/.r-pipe'<CR>o
 
 " Send current file to R
 noremap <buffer> <F5> :execute '1 ,' line("$") 'w >> ~/.r-pipe' <CR><CR>
+
+endif

ftplugin/rhelp.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
+  
 " ftplugin for R help files
 "
 " Author: Johannes Ranke <jranke@uni-bremen.de>
@@ -46,3 +48,5 @@ vnoremap <buffer> r :w >> ~/.r-pipe<CR>
 
 " Write and process mode (somehow mapping <C-Enter> does not work)
 inoremap <M-Enter> <Esc>:execute line(".") 'w >> ~/.r-pipe'<CR>o
+
+endif

ftplugin/rnoweb.vim

@@ -1,3 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
+  
 " ftplugin for Sweave files containing both LaTeX and R code
 "
 " Maintainer: Johannes Ranke <jranke@uni-bremen.de>
@@ -57,3 +59,5 @@ vnoremap <buffer> r :w >> ~/.r-pipe<CR>
 
 " Write and process mode (somehow mapping <C-Enter> does not work)
 inoremap <M-Enter> <Esc>:execute line(".") 'w >> ~/.r-pipe'<CR>o
+
+endif