summaryrefslogtreecommitdiffstats
path: root/ftdetect/polyglot.vim
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2015-03-08 21:50:10 -0700
committerAdam Stankiewicz <sheerun@sher.pl>2015-03-08 21:50:10 -0700
commitf24fecc338b5129a47c343f61daad2c2fe7a4ab0 (patch)
tree8d3d42701c411d711420d779c7cd8d05b145cfe2 /ftdetect/polyglot.vim
parent23913e0598d23ec5948b71ea78c549b39cecf764 (diff)
downloadvim-polyglot-1.13.0.tar.gz
vim-polyglot-1.13.0.zip
Change JSON provider to sheerun/vim-json, closes #51v1.13.0
Diffstat (limited to 'ftdetect/polyglot.vim')
-rw-r--r--ftdetect/polyglot.vim7
1 files changed, 1 insertions, 6 deletions
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 000b1c9b..cb0d263d 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -76,12 +76,7 @@ fun! s:SelectJavascript()
endfun
au BufNewFile,BufRead * call s:SelectJavascript()
autocmd BufNewFile,BufRead *.json set filetype=json
-augroup json_autocmd
- autocmd!
- autocmd FileType json setlocal autoindent
- autocmd FileType json setlocal formatoptions=tcq2l
- autocmd FileType json setlocal foldmethod=syntax
-augroup END
+autocmd BufNewFile,BufRead *.jsonp set filetype=json
au BufNewFile,BufRead *.ejs set filetype=jst
au BufNewFile,BufRead *.jst set filetype=jst
au BufNewFile,BufRead *.hamljs set filetype=jst