# HG changeset patch # User Christian Brabandt # Date 1464892206 -7200 # Node ID 0378a3bdf0fee8ddd4f30d7575c44e38a14881e6 # Parent bad4d76bf8d87958f7f3da0bde91324c6687b472 commit https://github.com/vim/vim/commit/76929af43134b4222b33648b6c53754a34f24524 Author: Bram Moolenaar Date: Thu Jun 2 20:26:41 2016 +0200 patch 7.4.1880 Problem: MS-Windows console build defaults to not having +channel. Solution: Include the channel feature if building with huge features. diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -263,6 +263,10 @@ WP64CHECK = /Wp64 # INCLUDE = c:\msvc20\include # LIB = c:\msvc20\lib +!if "$(FEATURES)"=="" +FEATURES = HUGE +!endif + !ifndef CTAGS CTAGS = ctags !endif @@ -283,8 +287,12 @@ NETBEANS = $(GUI) !endif !ifndef CHANNEL +!if "$(FEATURES)"=="HUGE" +CHANNEL = yes +!else CHANNEL = $(GUI) !endif +!endif # Only allow NETBEANS and XPM for a GUI build and CHANNEL. !if "$(GUI)" == "yes" @@ -953,9 +961,6 @@ CFLAGS = $(CFLAGS) -DMSWINPS # # FEATURES: TINY, SMALL, NORMAL, BIG or HUGE # -!if "$(FEATURES)"=="" -FEATURES = HUGE -!endif CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES) # diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1880, +/**/ 1879, /**/ 1878,