summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-17 11:33:42 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-17 11:33:42 +0200
commit84ed4ad08486f85948d4fe10a47aa2e312699eb9 (patch)
tree9f6b9bc85e10f20ceab7868580c88318b66c8c19
parentade59630c737026edfaeff2d76985b304a34afb5 (diff)
patch 8.0.0951: another wrong #ifdefv8.0.0951
Problem: Another wrong #ifdef. Solution: Change TERMINAL to FEAT_TERMINAL. (closes #1981)
-rw-r--r--src/option.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index 3dc52f8e73..0bcf21692d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3099,7 +3099,7 @@ static struct vimoption options[] =
#endif
{(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
{"winptydll", NULL, P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
-#if defined(WIN3264) && defined(TERMINAL)
+#if defined(WIN3264) && defined(FEAT_TERMINAL)
(char_u *)&p_winptydll, PV_NONE, {
# ifdef _WIN64
(char_u *)"winpty64.dll",
diff --git a/src/version.c b/src/version.c
index 41442adcc2..5abfd173b7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 951,
+/**/
950,
/**/
949,