Skip to content

Commit 21f8d93

Browse files
committed
patch 8.1.1500: wrong shell command when building with VIMDLL and "!" in 'go'
Problem: Wrong shell command when building with VIMDLL and "!" in 'guioptions'. Solution: Add check for GUI in use. (Ken Takata)
1 parent 24a5ac5 commit 21f8d93

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

src/misc2.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3253,7 +3253,11 @@ call_shell(char_u *cmd, int opt)
32533253

32543254
if (cmd == NULL || *p_sxq == NUL
32553255
#if defined(FEAT_GUI_MSWIN) && defined(FEAT_TERMINAL)
3256-
|| vim_strchr(p_go, GO_TERMINAL) != NULL
3256+
|| (
3257+
# ifdef VIMDLL
3258+
gui.in_use &&
3259+
# endif
3260+
vim_strchr(p_go, GO_TERMINAL) != NULL)
32573261
#endif
32583262
)
32593263
retval = mch_call_shell(cmd, opt);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,8 @@ static char *(features[]) =
767767

768768
static int included_patches[] =
769769
{ /* Add new patch number below this line */
770+
/**/
771+
1500,
770772
/**/
771773
1499,
772774
/**/

0 commit comments

Comments
 (0)