summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/evalfunc.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index cec6dabb4..ce45ad82a 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -6609,7 +6609,7 @@ f_has(typval_T *argvars, typval_T *rettv)
#endif
#ifdef FEAT_VTP
else if (STRICMP(name, "vcon") == 0)
- n = has_vtp_working();
+ n = is_term_win32() && has_vtp_working();
#endif
#ifdef FEAT_NETBEANS_INTG
else if (STRICMP(name, "netbeans_enabled") == 0)
diff --git a/src/version.c b/src/version.c
index a2780f470..86e24fdc1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -790,6 +790,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 124,
+/**/
123,
/**/
122,