summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/misc2.c10
-rw-r--r--src/version.c2
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
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1514,
+/**/
1513,
/**/
1512,