summaryrefslogtreecommitdiffstats
path: root/ftdetect
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2016-07-26 13:50:28 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2016-07-26 13:52:30 +0200
commitacd25ccf95f25ce2d93c92a45c9229531539249d (patch)
tree074d27c8f77c40c4f91c7fdc8db6ad9b0e91e4f1 /ftdetect
parent7dd62806a06af3cf2410cd8a4f83205269f279de (diff)
downloadvim-polyglot-acd25ccf95f25ce2d93c92a45c9229531539249d.tar.gz
vim-polyglot-acd25ccf95f25ce2d93c92a45c9229531539249d.zip
Switch to elzr for json syntax, and disable conceal by default
Diffstat (limited to 'ftdetect')
-rw-r--r--ftdetect/polyglot.vim10
1 files changed, 8 insertions, 2 deletions
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