changeset 12142:aaf50082a98a v8.0.0951

patch 8.0.0951: another wrong #ifdef commit https://github.com/vim/vim/commit/84ed4ad08486f85948d4fe10a47aa2e312699eb9 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Aug 17 11:33:42 2017 +0200 patch 8.0.0951: another wrong #ifdef Problem: Another wrong #ifdef. Solution: Change TERMINAL to FEAT_TERMINAL. (closes https://github.com/vim/vim/issues/1981)
author Christian Brabandt <cb@256bit.org>
date Thu, 17 Aug 2017 11:45:03 +0200
parents b50406468e5b
children 9af04854550d
files src/option.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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",
--- 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,