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 cec6dabb4a7a58934e657548b00adfbaa9c17185..ce45ad82a502d42d6c94512731ed6c9b38744d08 100644 (file)
--- 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 a2780f47073046f7955cb9c0ffe76e2fcbbb7338..86e24fdc1086622ed66ef9d001ed63b9c71e833c 100644 (file)
--- 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,
 /**/