Merge branch 'sbdchd-json'

This commit is contained in:
Chiel ten Brinke 2016-02-29 09:57:04 +01:00
commit e83775354e

View File

@ -112,7 +112,13 @@ endif
" JSON " JSON
if !exists('g:formatdef_jsbeautify_json') if !exists('g:formatdef_jsbeautify_json')
let g:formatdef_jsbeautify_json = '"js-beautify -f - -".(&expandtab ? "s ".shiftwidth() : "t")' if filereadable('.jsbeautifyrc')
let g:formatdef_jsbeautify_json = '"js-beautify"'
elseif filereadable(expand('~/.jsbeautifyrc'))
let g:formatdef_jsbeautify_json = '"js-beautify"'
else
let g:formatdef_jsbeautify_json = '"js-beautify -f - -".(&expandtab ? "s ".shiftwidth() : "t")'
endif
endif endif
if !exists('g:formatdef_pyjsbeautify_json') if !exists('g:formatdef_pyjsbeautify_json')