From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 13 May 2014 14:46:32 +0000 (+0200)
Subject: updated for version 7.4.291
X-Git-Tag: v7.4.291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e13207d82aa925e39eabc0f190c8696481fdf04;p=vim

updated for version 7.4.291
Problem:    Compiler warning for int to pointer of different size when DEBUG
            is defined.
Solution:   use smsg() instead of EMSG3().
---

diff --git a/src/regexp.c b/src/regexp.c
index c635c4f58..fe837721e 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -8022,8 +8022,8 @@ vim_regcomp(expr_arg, re_flags)
 	    regexp_engine = expr[4] - '0';
 	    expr += 5;
 #ifdef DEBUG
-	    EMSG3("New regexp mode selected (%d): %s", regexp_engine,
-						    regname[newengine]);
+	    smsg((char_u *)"New regexp mode selected (%d): %s",
+					   regexp_engine, regname[newengine]);
 #endif
 	}
 	else
diff --git a/src/version.c b/src/version.c
index fdda82c1f..030e6f21a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    291,
 /**/
     290,
 /**/