From: Bram Moolenaar Date: Fri, 3 Jun 2016 17:43:16 +0000 (+0200) Subject: patch 7.4.1885 X-Git-Tag: v7.4.1885 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1aa07bdead2e93501c54591e31fe73b9b09c58b5;p=thirdparty%2Fvim.git patch 7.4.1885 Problem: MinGW console build defaults to not having +channel. Solution: Include the channel feature if building with huge features. (Ken Takata) --- diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 62585e9961..cdf10aceef 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -67,7 +67,11 @@ CSCOPE=yes # Set to yes to enable Netbeans support (requires CHANNEL). NETBEANS=$(GUI) # Set to yes to enable inter process communication. +ifeq (HUGE, $(FEATURES)) +CHANNEL=yes +else CHANNEL=$(GUI) +endif # Link against the shared version of libstdc++ by default. Set diff --git a/src/version.c b/src/version.c index 0f9e840caf..e2624cff3e 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 */ +/**/ + 1885, /**/ 1884, /**/