]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.1160 v7.3.1160
authorBram Moolenaar <Bram@vim.org>
Mon, 10 Jun 2013 18:25:10 +0000 (20:25 +0200)
committerBram Moolenaar <Bram@vim.org>
Mon, 10 Jun 2013 18:25:10 +0000 (20:25 +0200)
Problem:    Mixing long and pointer doesn't always work.
Solution:   Avoid cast to pointer.

src/undo.c
src/version.c

index ba6ab379f0927d8bceececd92e87c56cf404e1f8..3acfad1ffa0c8433ae4265873b5de192eb879879 100644 (file)
@@ -1514,8 +1514,10 @@ u_write_undo(name, forceit, buf, hash)
        write_ok = TRUE;
 #ifdef U_DEBUG
     if (headers_written != buf->b_u_numhead)
-       EMSG3("Written %ld headers, but numhead is %ld",
-                                          headers_written, buf->b_u_numhead);
+    {
+       EMSGN("Written %ld headers, ...", headers_written);
+       EMSGN("... but numhead is %ld", buf->b_u_numhead);
+    }
 #endif
 
 write_error:
index 394e6d57448fff3660228d900498212adf85f447..5268d54f2fd51ee90d6deab34bf095323e7d6ea7 100644 (file)
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1160,
 /**/
     1159,
 /**/