Skip to content

Commit 01257a7

Browse files
committed
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)
1 parent 3ff5f0f commit 01257a7

2 files changed

Lines changed: 3 additions & 9 deletions

File tree

src/misc2.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3251,15 +3251,7 @@ call_shell(char_u *cmd, int opt)
32513251
/* The external command may update a tags file, clear cached tags. */
32523252
tag_freematch();
32533253

3254-
if (cmd == NULL || *p_sxq == NUL
3255-
#if defined(FEAT_GUI_MSWIN) && defined(FEAT_TERMINAL)
3256-
|| (
3257-
# ifdef VIMDLL
3258-
gui.in_use &&
3259-
# endif
3260-
vim_strchr(p_go, GO_TERMINAL) != NULL)
3261-
#endif
3262-
)
3254+
if (cmd == NULL || *p_sxq == NUL)
32633255
retval = mch_call_shell(cmd, opt);
32643256
else
32653257
{

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,8 @@ static char *(features[]) =
777777

778778
static int included_patches[] =
779779
{ /* Add new patch number below this line */
780+
/**/
781+
1514,
780782
/**/
781783
1513,
782784
/**/

0 commit comments

Comments
 (0)