summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/misc2.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/misc2.c b/src/misc2.c
index 45070d719..47b3c7299 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -3253,7 +3253,11 @@ call_shell(char_u *cmd, int opt)
if (cmd == NULL || *p_sxq == NUL
#if defined(FEAT_GUI_MSWIN) && defined(FEAT_TERMINAL)
- || vim_strchr(p_go, GO_TERMINAL) != NULL
+ || (
+# ifdef VIMDLL
+ gui.in_use &&
+# endif
+ vim_strchr(p_go, GO_TERMINAL) != NULL)
#endif
)
retval = mch_call_shell(cmd, opt);
diff --git a/src/version.c b/src/version.c
index 6635610f9..b0dcd3b11 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 */
/**/
+ 1500,
+/**/
1499,
/**/
1498,