summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-05-13 16:46:32 +0200
committerBram Moolenaar <Bram@vim.org>2014-05-13 16:46:32 +0200
commit6e13207d82aa925e39eabc0f190c8696481fdf04 (patch)
treef692fba16ecd98584893a946564fb9a802016423
parent9c235069b237caed426eff14ce91df46bc69e234 (diff)
updated for version 7.4.291v7.4.291
Problem: Compiler warning for int to pointer of different size when DEBUG is defined. Solution: use smsg() instead of EMSG3().
-rw-r--r--src/regexp.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/regexp.c b/src/regexp.c
index c635c4f580..fe837721eb 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 fdda82c1f5..030e6f21a2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 291,
+/**/
290,
/**/
289,