Merge branch 'davibe-master'

This commit is contained in:
Chiel92 2014-08-19 13:32:50 +02:00
commit 5f6b0bcd22

View File

@ -45,7 +45,7 @@ endif
if !exists("g:formatprg_javascript") | let g:formatprg_javascript = "js-beautify" | endif if !exists("g:formatprg_javascript") | let g:formatprg_javascript = "js-beautify" | endif
if !exists("g:formatprg_args_expr_javascript") && !exists("g:formatprg_args_javascript") if !exists("g:formatprg_args_expr_javascript") && !exists("g:formatprg_args_javascript")
let g:formatprg_args_expr_javascript = '"-f - -".(&expandtab ? "s ".&shiftwidth : "t")' let g:formatprg_args_expr_javascript = '"-f - -".(&expandtab ? "s ".&shiftwidth : "t").(&textwidth ? " -w ".&textwidth : "")'
endif endif
if !exists("g:formatprg_json") | let g:formatprg_json = "js-beautify" | endif if !exists("g:formatprg_json") | let g:formatprg_json = "js-beautify" | endif