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)

diff --git a/src/misc2.c b/src/misc2.c
index 45070d7197a5394491dce4e551caa1916a759444..47b3c7299a32bde6b674ff8aa2ec1b9d62ad7c6a 100644 (file)
--- 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 6635610f9f8a29a282f5ff406f74481bf50948d1..b0dcd3b11264137c8885d539edc5a2d873921711 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1500,
 /**/
     1499,
 /**/