From acd25ccf95f25ce2d93c92a45c9229531539249d Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Tue, 26 Jul 2016 13:50:28 +0200 Subject: Switch to elzr for json syntax, and disable conceal by default --- ftdetect/polyglot.vim | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'ftdetect') diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim index c6e16496..6e032523 100644 --- a/ftdetect/polyglot.vim +++ b/ftdetect/polyglot.vim @@ -2,6 +2,11 @@ if !exists('g:jsx_ext_required') let g:jsx_ext_required = 0 endif + +" Disable json concealing by default +if !exists('g:vim_json_syntax_conceal') + let g:vim_json_syntax_conceal = 0 +endif " ftdetect/ansible.vim if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1 @@ -404,8 +409,9 @@ endif " ftdetect/json.vim if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1 -autocmd BufNewFile,BufRead *.json set filetype=json -autocmd BufNewFile,BufRead *.jsonp set filetype=json +autocmd BufNewFile,BufRead *.json setlocal filetype=json +autocmd BufNewFile,BufRead *.jsonp setlocal filetype=json +autocmd BufNewFile,BufRead *.geojson setlocal filetype=json endif -- cgit v1.2.3