To: vim_dev@googlegroups.com Subject: Patch 7.4.1544 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1544 Problem: On Win32 escaping the command does not work properly. Solution: Reset 'ssl' when escaping the command. (Yasuhiro Matsumoto) Files: src/channel.c *** ../vim-7.4.1543/src/channel.c 2016-03-12 15:22:50.410535232 +0100 --- src/channel.c 2016-03-12 15:57:01.045157618 +0100 *************** *** 3625,3631 **** --- 3625,3641 ---- /* 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); *** ../vim-7.4.1543/src/version.c 2016-03-12 15:51:37.604527751 +0100 --- src/version.c 2016-03-12 15:58:20.596329498 +0100 *************** *** 745,746 **** --- 745,748 ---- { /* Add new patch number below this line */ + /**/ + 1544, /**/ -- "Space is big. Really big. You just won't believe how vastly hugely mind- bogglingly big it is. I mean, you may think it's a long way down the road to the chemist, but that's just peanuts to space." -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///