patch 8.0.1192: MS-Windows: terminal feature not enabled by default

Problem:    MS-Windows: terminal feature not enabled by default.
Solution:   Enable it. (Ken Takata)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index a855f066e590f66f17d9df5ec6013f37ee359e9e..87de4e9a0913002618fd9fad0d6a2f17b0ee3e8b 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -47,6 +47,7 @@ FEATURES=HUGE
 # Set to yes to cross-compile from unix; no=native Windows (and Cygwin).
 CROSS=no
 # Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'.
+# Use "yes" when the path does not need to be define.
 #ICONV="."
 ICONV=yes
 GETTEXT=yes
@@ -74,7 +75,11 @@ else
 CHANNEL=$(GUI)
 endif
 # Set to yes to enable terminal support.
+ifeq (HUGE, $(FEATURES))
+TERMINAL=yes
+else
 TERMINAL=no
+endif
 
 ifndef CTAGS
 # this assumes ctags is Exuberant ctags

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 478bf69dcc4009747aec8b977dfe5638542ca2bd..30a52f4b9c780c104b6bf243fdab701ea350074c 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -37,7 +37,7 @@
 #        is yes)
 #      Global IME support: GIME=yes (requires GUI=yes)
 #
-#       Terminal support: TERMINAL=yes (default is no)
+#       Terminal support: TERMINAL=yes (default is yes)
 #
 #      Lua interface:
 #        LUA=[Path to Lua directory]
@@ -361,6 +361,14 @@ CSCOPE_OBJ   = $(OBJDIR)/if_cscope.obj
 CSCOPE_DEFS  = -DFEAT_CSCOPE
 !endif
 
+!ifndef TERMINAL
+!if "$(FEATURES)"=="HUGE"
+TERMINAL = yes
+!else
+TERMINAL = no
+!endif
+!endif
+
 !if "$(TERMINAL)" == "yes"
 TERM_OBJ = \
        $(OBJDIR)/terminal.obj \

diff --git a/src/version.c b/src/version.c
index a119dc88138627a338bd18b9c7eb40254274de07..d16baeb27e9f56e16e09771661e4a99e2c536859 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1192,
 /**/
     1191,
 /**/