From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 13 Dec 2014 19:50:09 +0000 (+0100)
Subject: updated for version 7.4.548
X-Git-Tag: v7.4.548
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d78cd7756ac5c666e85222aea54d45b04b949a4;p=thirdparty%2Fvim.git

updated for version 7.4.548
Problem:    Function name not recognized correctly when inside a function.
Solution:   Don't check for an alpha character.
---

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 455750e33b..1f55a9e6ab 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -366,7 +366,11 @@ endif
 endif
 CC := $(CROSS_COMPILE)gcc
 CXX := $(CROSS_COMPILE)g++
+ifeq ($(UNDER_CYGWIN),yes)
 WINDRES := $(CROSS_COMPILE)windres
+else
+WINDRES := windres
+endif
 WINDRES_CC = $(CC)
 
 #>>>>> end of choices
diff --git a/src/version.c b/src/version.c
index 7abbfb5915..05a9875534 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    548,
 /**/
     547,
 /**/