Merge branch 'sbdchd-js-beautify'

This commit is contained in:
Chiel ten Brinke 2016-02-24 10:06:22 +01:00
commit a2f9b88bcd

View File

@ -84,8 +84,14 @@ endif
" Javascript
if !exists('g:formatdef_jsbeautify_javascript')
if filereadable('.jsbeautifyrc')
let g:formatdef_jsbeautify_javascript = '"js-beautify"'
elseif filereadable(expand('~/.jsbeautifyrc'))
let g:formatdef_jsbeautify_javascript = '"js-beautify"'
else
let g:formatdef_jsbeautify_javascript = '"js-beautify -f - -".(&expandtab ? "s ".shiftwidth() : "t").(&textwidth ? " -w ".&textwidth : "")'
endif
endif
if !exists('g:formatdef_pyjsbeautify_javascript')
let g:formatdef_pyjsbeautify_javascript = '"js-beautify -".(&expandtab ? "s ".shiftwidth() : "t").(&textwidth ? " -w ".&textwidth : "")." -"'