changeset 17000:63b3e1c80175 v8.1.1500

patch 8.1.1500: wrong shell command when building with VIMDLL and "!" in 'go' commit https://github.com/vim/vim/commit/21f8d93c7184e69aa76a5caa1d3869b6226189e0 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jun 8 20:17:18 2019 +0200 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)
author Bram Moolenaar <Bram@vim.org>
date Sat, 08 Jun 2019 20:30:05 +0200
parents 7eaf8a6452c3
children 1bf238956770
files src/misc2.c src/version.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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,