diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-10 14:46:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-10 14:46:04 +0200 |
| commit | 01257a7a8e231904ff73fae1f7783e0b6eb4d5aa (patch) | |
| tree | cd385eff9f2b68c909a67be71477ee50aa1af73b | |
| parent | 3ff5f0f05d437a6b3eaf3caa5dc2762b49314617 (diff) | |
patch 8.1.1514: MS-Windows: wrong shell command with ! in 'guioptions'v8.1.1514
Problem: MS-Windows: wrong shell command with ! in 'guioptions'.
Solution: Do not check for ! in 'guioptions' when applying 'shellxquote'.
(Yasuhiro Matsumoto, closes #4519)
| -rw-r--r-- | src/misc2.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/misc2.c b/src/misc2.c index 47b3c7299a..2ac7f5e77c 100644 --- 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 76b874e1b4..8420be6978 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1514, +/**/ 1513, /**/ 1512, |