0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

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)
This commit is contained in:
Bram Moolenaar
2017-10-14 20:24:19 +02:00
parent 6199d43f4b
commit ac8069bb63
3 changed files with 16 additions and 1 deletions

View File

@@ -47,6 +47,7 @@ FEATURES=HUGE
# Set to yes to cross-compile from unix; no=native Windows (and Cygwin). # Set to yes to cross-compile from unix; no=native Windows (and Cygwin).
CROSS=no CROSS=no
# Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'. # 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="."
ICONV=yes ICONV=yes
GETTEXT=yes GETTEXT=yes
@@ -74,7 +75,11 @@ else
CHANNEL=$(GUI) CHANNEL=$(GUI)
endif endif
# Set to yes to enable terminal support. # Set to yes to enable terminal support.
ifeq (HUGE, $(FEATURES))
TERMINAL=yes
else
TERMINAL=no TERMINAL=no
endif
ifndef CTAGS ifndef CTAGS
# this assumes ctags is Exuberant ctags # this assumes ctags is Exuberant ctags

View File

@@ -37,7 +37,7 @@
# is yes) # is yes)
# Global IME support: GIME=yes (requires GUI=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 interface:
# LUA=[Path to Lua directory] # LUA=[Path to Lua directory]
@@ -361,6 +361,14 @@ CSCOPE_OBJ = $(OBJDIR)/if_cscope.obj
CSCOPE_DEFS = -DFEAT_CSCOPE CSCOPE_DEFS = -DFEAT_CSCOPE
!endif !endif
!ifndef TERMINAL
!if "$(FEATURES)"=="HUGE"
TERMINAL = yes
!else
TERMINAL = no
!endif
!endif
!if "$(TERMINAL)" == "yes" !if "$(TERMINAL)" == "yes"
TERM_OBJ = \ TERM_OBJ = \
$(OBJDIR)/terminal.obj \ $(OBJDIR)/terminal.obj \

View File

@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1192,
/**/ /**/
1191, 1191,
/**/ /**/