Merge branch 'master' into gcc_refactor

This commit is contained in:
LCD 47 2013-07-10 11:21:22 +03:00
commit 6bff80366a
2 changed files with 3 additions and 3 deletions

View File

@ -166,7 +166,7 @@ endfunction
" A less noisy shellescape(expand())
function! syntastic#util#shexpand(string)
return syntastic#util#shescape(expand(a:string))
return syntastic#util#shescape(escape(expand(a:string), '|'))
endfunction
function! syntastic#util#debug(msg)

View File

@ -112,10 +112,10 @@ function s:GetOcamlcMakeprg()
if g:syntastic_ocaml_use_janestreet_core
let build_cmd = "ocamlc -I "
let build_cmd .= expand(g:syntastic_ocaml_janestreet_core_dir)
let build_cmd .= " -c " . expand('%')
let build_cmd .= " -c " . syntastic#util#shexpand('%')
return build_cmd
else
return "ocamlc -c " . expand('%')
return "ocamlc -c " . syntastic#util#shexpand('%')
endif
endfunction