From 01257a7a8e231904ff73fae1f7783e0b6eb4d5aa Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 10 Jun 2019 14:46:04 +0200 Subject: [PATCH] patch 8.1.1514: MS-Windows: wrong shell command with ! in 'guioptions' Problem: MS-Windows: wrong shell command with ! in 'guioptions'. Solution: Do not check for ! in 'guioptions' when applying 'shellxquote'. (Yasuhiro Matsumoto, closes #4519) --- src/misc2.c | 10 +--------- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/misc2.c b/src/misc2.c index 47b3c7299..2ac7f5e77 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 76b874e1b..8420be697 100644 --- a/src/version.c +++ b/src/version.c @@ -777,6 +777,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1514, /**/ 1513, /**/ -- 2.50.1