From: Bram Moolenaar Date: Sat, 12 Mar 2016 14:58:34 +0000 (+0100) Subject: patch 7.4.1544 X-Git-Tag: v7.4.1544 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=583c1f14a4e1d89fe029b1c134d405357468ece7;p=vim patch 7.4.1544 Problem: On Win32 escaping the command does not work properly. Solution: Reset 'ssl' when escaping the command. (Yasuhiro Matsumoto) --- diff --git a/src/channel.c b/src/channel.c index 8f70da276..99f053a2f 100644 --- a/src/channel.c +++ b/src/channel.c @@ -3625,7 +3625,17 @@ job_start(typval_T *argvars) /* Only escape when needed, double quotes are not always allowed. */ if (li != l->lv_first && vim_strpbrk(s, (char_u *)" \t\"") != NULL) { +# ifdef WIN32 + int old_ssl = p_ssl; + + /* This is using CreateProcess, not cmd.exe. Always use + * double quote and backslashes. */ + p_ssl = 0; +# endif s = vim_strsave_shellescape(s, FALSE, TRUE); +# ifdef WIN32 + p_ssl = old_ssl; +# endif if (s == NULL) goto theend; ga_concat(&ga, s); diff --git a/src/version.c b/src/version.c index 2eb011484..f907012ab 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1544, /**/ 1543, /**/