patch 9.0.0606: system() opens a terminal window when "!" is in 'guioptions'

Problem:    system() opens a terminal window when using the GUI and "!" is in
            'guioptions'.
Solution:   Do not use a terminal window when the SHELL_SILENT flag is used.
            (closes #11202)

diff --git a/src/os_unix.c b/src/os_unix.c
index 1ac6e190bce1a1c4af20b86b04be56a529ad6994..e86e3083701f687c656cacc1a99c8f0321a962f6 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5476,7 +5476,8 @@ mch_call_shell(
     ch_log(NULL, "executing shell command: %s", cmd);
 #endif
 #if defined(FEAT_GUI) && defined(FEAT_TERMINAL)
-    if (gui.in_use && vim_strchr(p_go, GO_TERMINAL) != NULL)
+    if (gui.in_use && vim_strchr(p_go, GO_TERMINAL) != NULL
+                                             && (options & SHELL_SILENT) == 0)
        return mch_call_shell_terminal(cmd, options);
 #endif
 #ifdef USE_SYSTEM

diff --git a/src/version.c b/src/version.c
index c9dab4d35aa6457afbadcb1aff69e813fc5873f8..5a4cb9f380635c14028c58444274adb5b587bf47 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    606,
 /**/
     605,
 /**/