From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 10 Jun 2019 12:46:04 +0000 (+0200)
Subject: patch 8.1.1514: MS-Windows: wrong shell command with ! in 'guioptions'
X-Git-Tag: v8.1.1514
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01257a7a8e231904ff73fae1f7783e0b6eb4d5aa;p=vim

patch 8.1.1514: MS-Windows: wrong shell command with ! in 'guioptions'

Problem:    MS-Windows: wrong shell command with ! in 'guioptions'.
Solution:   Do not check for ! in 'guioptions' when applying 'shellxquote'.
            (Yasuhiro Matsumoto, closes #4519)
---

diff --git a/src/misc2.c b/src/misc2.c
index 47b3c7299..2ac7f5e77 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -3251,15 +3251,7 @@ call_shell(char_u *cmd, int opt)
 	/* The external command may update a tags file, clear cached tags. */
 	tag_freematch();
 
-	if (cmd == NULL || *p_sxq == NUL
-#if defined(FEAT_GUI_MSWIN) && defined(FEAT_TERMINAL)
-		|| (
-# ifdef VIMDLL
-		    gui.in_use &&
-# endif
-		    vim_strchr(p_go, GO_TERMINAL) != NULL)
-#endif
-		)
+	if (cmd == NULL || *p_sxq == NUL)
 	    retval = mch_call_shell(cmd, opt);
 	else
 	{
diff --git a/src/version.c b/src/version.c
index 76b874e1b..8420be697 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1514,
 /**/
     1513,
 /**/