From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 28 Jun 2018 13:50:28 +0000 (+0200)
Subject: patch 8.1.0124: has('vcon') returns true even for non-win32 terminal
X-Git-Tag: v8.1.0124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8b37a53bd29cab78c6997aa75207385213f23e2;p=thirdparty%2Fvim.git

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)
---

diff --git a/src/evalfunc.c b/src/evalfunc.c
index cec6dabb4a..ce45ad82a5 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 a2780f4707..86e24fdc10 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,
 /**/