diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-12-13 20:50:09 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-12-13 20:50:09 +0100 |
| commit | 2d78cd7756ac5c666e85222aea54d45b04b949a4 (patch) | |
| tree | d8c17c7b76b71378f4cd84ea67ad8a7c4da00063 /src | |
| parent | 8340dd9b2919299bd5802227fcdf2df706592d41 (diff) | |
updated for version 7.4.548v7.4.548
Problem: Function name not recognized correctly when inside a function.
Solution: Don't check for an alpha character.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make_cyg_ming.mak | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 548, +/**/ 547, /**/ 546, |