From f4ccd312ee1839dcedbd7c100ac106b2fcb36b6a Mon Sep 17 00:00:00 2001 From: LCD 47 Date: Wed, 10 Jul 2013 11:20:54 +0300 Subject: [PATCH] More shell escaping bugs. --- autoload/syntastic/util.vim | 2 +- syntax_checkers/ocaml/camlp4o.vim | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/autoload/syntastic/util.vim b/autoload/syntastic/util.vim index db52d7f2..4b0d4624 100644 --- a/autoload/syntastic/util.vim +++ b/autoload/syntastic/util.vim @@ -161,7 +161,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) diff --git a/syntax_checkers/ocaml/camlp4o.vim b/syntax_checkers/ocaml/camlp4o.vim index e2409ec1..ebec5cb7 100644 --- a/syntax_checkers/ocaml/camlp4o.vim +++ b/syntax_checkers/ocaml/camlp4o.vim @@ -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