summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/os_unix.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 1ac6e190b..e86e30837 100644
--- 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 c9dab4d35..5a4cb9f38 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 606,
+/**/
605,
/**/
604,