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 47b3c7299a32bde6b674ff8aa2ec1b9d62ad7c6a..2ac7f5e77cbc0d657d780ad79fc8185d48e92f0e 100644 (file)
--- 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 76b874e1b4a9a59b9a2e29161be0073872475fea..8420be6978456bdcb318a252e1a9c51d214914ed 100644 (file)
--- 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,
 /**/