diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-06-28 15:50:28 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-06-28 15:50:28 +0200 |
| commit | d8b37a53bd29cab78c6997aa75207385213f23e2 (patch) | |
| tree | b474a183419437e338fcb2d85cf026a24ed530d7 | |
| parent | b0eb14f9392a8d95045182c4e520530319ce44c2 (diff) | |
| download | vim-d8b37a53bd29cab78c6997aa75207385213f23e2.zip | |
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)
| -rw-r--r-- | src/evalfunc.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |