From d8b37a53bd29cab78c6997aa75207385213f23e2 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 28 Jun 2018 15:50:28 +0200
Subject: [PATCH] patch 8.1.0124: has('vcon') returns true even for non-win32
terminal
Problem: has('vcon') returns true even for non-win32 terminal.
Solution: Check the terminal type. (Nobuhiro Takasaki, closes #3106)
---
src/evalfunc.c | 2 +-
src/version.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
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
@@ -789,6 +789,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 124,
/**/
123,
/**/
--
2.40.0