]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.291 v7.4.291
authorBram Moolenaar <Bram@vim.org>
Tue, 13 May 2014 14:46:32 +0000 (16:46 +0200)
committerBram Moolenaar <Bram@vim.org>
Tue, 13 May 2014 14:46:32 +0000 (16:46 +0200)
Problem:    Compiler warning for int to pointer of different size when DEBUG
            is defined.
Solution:   use smsg() instead of EMSG3().

src/regexp.c
src/version.c

index c635c4f580b342bd681ee76118ff0d7a8ccd76b4..fe837721eba3142ea477608acd6fdeaf728a5d15 100644 (file)
@@ -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
index fdda82c1f5d04cc265840ab68442bb0f3d65b8d7..030e6f21a271401a42898ef17a52e68770aa2bca 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    291,
 /**/
     290,
 /**/