diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-24 13:32:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-24 13:32:36 +0200 |
| commit | fcc4d921d6761b833ae89ca3dc450c48c270ca36 (patch) | |
| tree | 39674ab828e815cd1115161f2edd2fc1533aa38d | |
| parent | e2ad826f431b2f8dd1b235c219282cc3961f7188 (diff) | |
patch 8.1.1377: MS-Windows GUI uses wrong shell command for bashv8.1.1377
Problem: MS-Windows GUI uses wrong shell command for bash. (Robert Bogomip)
Solution: Check that 'shellcmdflag' is "/c". (Ken Takata, closes #4418)
| -rw-r--r-- | src/os_win32.c | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 33d48cf7fa..237de979e6 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -4856,27 +4856,25 @@ mch_call_shell( (gui.in_use || gui.starting) && # endif !s_dont_use_vimrun && p_stmp) - /* Use vimrun to execute the command. It opens a console - * window, which can be closed without killing Vim. */ + // Use vimrun to execute the command. It opens a console + // window, which can be closed without killing Vim. vim_snprintf((char *)newcmd, cmdlen, "%s%s%s %s %s", vimrun_path, (msg_silent != 0 || (options & SHELL_DOOUT)) ? "-s " : "", p_sh, p_shcf, cmd); - else + else if ( # ifdef VIMDLL - if (gui.in_use || gui.starting) + (gui.in_use || gui.starting) && # endif + STRCMP(p_shcf, "/c") == 0) + // workaround for the case that "vimrun" does not exist vim_snprintf((char *)newcmd, cmdlen, "%s %s %s %s %s", p_sh, p_shcf, p_sh, p_shcf, cmd); -# ifdef VIMDLL else -# endif #endif -#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) vim_snprintf((char *)newcmd, cmdlen, "%s %s %s", p_sh, p_shcf, cmd); -#endif x = mch_system((char *)newcmd, options); vim_free(newcmd); } diff --git a/src/version.c b/src/version.c index 26c407195c..b2278ed02a 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1377, +/**/ 1376, /**/ 1375, |