diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-08 20:17:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-08 20:17:18 +0200 |
| commit | 21f8d93c7184e69aa76a5caa1d3869b6226189e0 (patch) | |
| tree | da620a6aea7da339ec985e2c055bfc35d0daf5d5 | |
| parent | 24a5ac5d4dbc4dc5d6d2b7e4dda6612dd9233f5d (diff) | |
patch 8.1.1500: wrong shell command when building with VIMDLL and "!" in 'go'v8.1.1500
Problem: Wrong shell command when building with VIMDLL and "!" in
'guioptions'.
Solution: Add check for GUI in use. (Ken Takata)
| -rw-r--r-- | src/misc2.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/misc2.c b/src/misc2.c index 45070d7197..47b3c7299a 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -3253,7 +3253,11 @@ call_shell(char_u *cmd, int opt) if (cmd == NULL || *p_sxq == NUL #if defined(FEAT_GUI_MSWIN) && defined(FEAT_TERMINAL) - || vim_strchr(p_go, GO_TERMINAL) != NULL + || ( +# ifdef VIMDLL + gui.in_use && +# endif + vim_strchr(p_go, GO_TERMINAL) != NULL) #endif ) retval = mch_call_shell(cmd, opt); diff --git a/src/version.c b/src/version.c index 6635610f9f..b0dcd3b112 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1500, +/**/ 1499, /**/ 1498, |