Mercurial > vim

changeset 6436:26a20ce3532c v7.4.548

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.548 Problem: Function name not recognized correctly when inside a function. Solution: Don't check for an alpha character.
author Bram Moolenaar <bram@vim.org>
date Sat, 13 Dec 2014 20:50:09 +0100
parents 0a7e42f509ea
children 520b9b2df2d8
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,