summaryrefslogtreecommitdiffstats
path: root/src/evalfunc.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-17 14:39:07 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-17 14:39:07 +0200
commita83e3962ac0e4bbfef15a072ad9a7390fc255409 (patch)
tree0593f07a82ffacfeba89d968264eac5c5adf7e2c /src/evalfunc.c
parent84ed4ad08486f85948d4fe10a47aa2e312699eb9 (diff)
patch 8.0.0952: has('terminal') does not check existence of dll filev8.0.0952
Problem: MS-Windows: has('terminal') does not check existence of dll file. Solution: Check if the winpty dll file can be loaded. (Ken Takata)
Diffstat (limited to 'src/evalfunc.c')
-rw-r--r--src/evalfunc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 452183594f..c85c334c82 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5926,7 +5926,7 @@ f_has(typval_T *argvars, typval_T *rettv)
#ifdef FEAT_TERMGUICOLORS
"termguicolors",
#endif
-#ifdef FEAT_TERMINAL
+#if defined(FEAT_TERMINAL) && !defined(WIN3264)
"terminal",
#endif
#ifdef TERMINFO
@@ -6134,6 +6134,10 @@ f_has(typval_T *argvars, typval_T *rettv)
else if (STRICMP(name, "netbeans_enabled") == 0)
n = netbeans_active();
#endif
+#if defined(FEAT_TERMINAL) && defined(WIN3264)
+ else if (STRICMP(name, "terminal") == 0)
+ n = terminal_enabled();
+#endif
}
rettv->vval.v_number = n;