mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.1.1377: MS-Windows GUI uses wrong shell command for bash
Problem: MS-Windows GUI uses wrong shell command for bash. (Robert Bogomip) Solution: Check that 'shellcmdflag' is "/c". (Ken Takata, closes #4418)
This commit is contained in:
@@ -4856,27 +4856,25 @@ mch_call_shell(
|
|||||||
(gui.in_use || gui.starting) &&
|
(gui.in_use || gui.starting) &&
|
||||||
# endif
|
# endif
|
||||||
!s_dont_use_vimrun && p_stmp)
|
!s_dont_use_vimrun && p_stmp)
|
||||||
/* Use vimrun to execute the command. It opens a console
|
// Use vimrun to execute the command. It opens a console
|
||||||
* window, which can be closed without killing Vim. */
|
// window, which can be closed without killing Vim.
|
||||||
vim_snprintf((char *)newcmd, cmdlen, "%s%s%s %s %s",
|
vim_snprintf((char *)newcmd, cmdlen, "%s%s%s %s %s",
|
||||||
vimrun_path,
|
vimrun_path,
|
||||||
(msg_silent != 0 || (options & SHELL_DOOUT))
|
(msg_silent != 0 || (options & SHELL_DOOUT))
|
||||||
? "-s " : "",
|
? "-s " : "",
|
||||||
p_sh, p_shcf, cmd);
|
p_sh, p_shcf, cmd);
|
||||||
else
|
else if (
|
||||||
# ifdef VIMDLL
|
# ifdef VIMDLL
|
||||||
if (gui.in_use || gui.starting)
|
(gui.in_use || gui.starting) &&
|
||||||
# endif
|
# 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",
|
vim_snprintf((char *)newcmd, cmdlen, "%s %s %s %s %s",
|
||||||
p_sh, p_shcf, p_sh, p_shcf, cmd);
|
p_sh, p_shcf, p_sh, p_shcf, cmd);
|
||||||
# ifdef VIMDLL
|
|
||||||
else
|
else
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
|
|
||||||
vim_snprintf((char *)newcmd, cmdlen, "%s %s %s",
|
vim_snprintf((char *)newcmd, cmdlen, "%s %s %s",
|
||||||
p_sh, p_shcf, cmd);
|
p_sh, p_shcf, cmd);
|
||||||
#endif
|
|
||||||
x = mch_system((char *)newcmd, options);
|
x = mch_system((char *)newcmd, options);
|
||||||
vim_free(newcmd);
|
vim_free(newcmd);
|
||||||
}
|
}
|
||||||
|
@@ -767,6 +767,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 */
|
||||||
|
/**/
|
||||||
|
1377,
|
||||||
/**/
|
/**/
|
||||||
1376,
|
1376,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user