From 21f8d93c7184e69aa76a5caa1d3869b6226189e0 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 8 Jun 2019 20:17:18 +0200
Subject: [PATCH] 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)
---
 src/misc2.c   | 6 +++++-
 src/version.c | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

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
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1500,
 /**/
     1499,
 /**/
-- 
2.50.1