summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-10 20:25:10 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-10 20:25:10 +0200
commit570064cf21091a211d9de50dbfd23304cdf048ee (patch)
tree4dc9f4f02de6f3d81de608269762a06a0e5a0c61
parenta2e14fc764c306cc33fe174707756be70f883319 (diff)
updated for version 7.3.1160v7.3.1160
Problem: Mixing long and pointer doesn't always work. Solution: Avoid cast to pointer.
-rw-r--r--src/undo.c6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/undo.c b/src/undo.c
index ba6ab379f0..3acfad1ffa 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -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:
diff --git a/src/version.c b/src/version.c
index 394e6d5744..5268d54f2f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1160,
+/**/
1159,
/**/
1158,