# HG changeset patch # User Christian Brabandt # Date 1455488105 -3600 # Node ID 7e298e8c574136e36612526c1141e3726d9b196a # Parent b1c4aaa352063b00994ff7682f1f033b9cef4aef commit https://github.com/vim/vim/commit/44d571868f4fcf000e8b03ee0a350f1f8131c9ca Author: Bram Moolenaar Date: Sun Feb 14 23:11:23 2016 +0100 patch 7.4.1320 Problem: Building with Cygwin or MingW with channel but without Netbeans doesn't work. Solution: Set NETBEANS to "no" when not used. diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -679,8 +679,10 @@ ifneq ($(CHANNEL),yes) # Cannot use Netbeans without CHANNEL NETBEANS=no else -# Only allow NETBEANS for a GUI build. -ifeq (yes, $(GUI)) +ifneq (yes, $(GUI)) +# Cannot use Netbeans without GUI. +NETBEANS=no +else OBJ += $(OUTDIR)/netbeans.o LIB += -lwsock32 endif diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1320, +/**/ 1319, /**/ 1318,