From: Bram Moolenaar Date: Mon, 10 Jun 2013 18:25:10 +0000 (+0200) Subject: updated for version 7.3.1160 X-Git-Tag: v7.3.1160 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=570064cf21091a211d9de50dbfd23304cdf048ee;p=vim updated for version 7.3.1160 Problem: Mixing long and pointer doesn't always work. Solution: Avoid cast to pointer. --- diff --git a/src/undo.c b/src/undo.c index ba6ab379f..3acfad1ff 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 394e6d574..5268d54f2 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1160, /**/ 1159, /**/