aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 7.4.1544

Browse Source 
Problem:    On Win32 escaping the command does not work properly.
Solution:   Reset 'ssl' when escaping the command. (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar
2016-03-12 15:58:34 +01:00
parent 5a6ec52392
commit 583c1f14a4
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/channel.c
View File

@@ -3625,7 +3625,17 @@ job_start(typval_T *argvars)
/* Only escape when needed, double quotes are not always allowed. */ /* Only escape when needed, double quotes are not always allowed. */
if (li != l->lv_first && vim_strpbrk(s, (char_u *)" \t\"") != NULL) 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); s = vim_strsave_shellescape(s, FALSE, TRUE);
# ifdef WIN32
p_ssl = old_ssl;
# endif
if (s == NULL) if (s == NULL)
goto theend; goto theend;
ga_concat(&ga, s); ga_concat(&ga, s);

2
src/version.c
View File

@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1544,
/**/ /**/
1543, 1543,
/**/ /**/