From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 14 Feb 2016 22:11:23 +0000 (+0100)
Subject: patch 7.4.1320
X-Git-Tag: v7.4.1320
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44d571868f4fcf000e8b03ee0a350f1f8131c9ca;p=vim

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
index 026c966bf..28d31d612 100644
--- 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
index c047848fa..a380ed341 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1320,
 /**/
     1319,
 /**/