From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 2 Jun 2016 18:26:41 +0000 (+0200)
Subject: patch 7.4.1880
X-Git-Tag: v7.4.1880
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76929af43134b4222b33648b6c53754a34f24524;p=thirdparty%2Fvim.git

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
index 841dbd4efd..c4529b72bd 100644
--- 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
index 7373e70ddc..9cf3972cbd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1880,
 /**/
     1879,
 /**/