diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-09-27 15:48:20 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-09-27 15:48:20 +0100 |
| commit | 524c853e5ef0392fcf28e449946e05e7e3046e67 (patch) | |
| tree | 912a0dc30ac31bc855dfb28305ff93c54895ca43 | |
| parent | 439a2ba1749463718b6ce1e1375b68c7b7cff808 (diff) | |
| download | vim-git-524c853e5ef0392fcf28e449946e05e7e3046e67.tar.gz | |
patch 9.0.0606: system() opens a terminal window when "!" is in 'guioptions'v9.0.0606
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)
| -rw-r--r-- | src/os_unix.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |