summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-09-11 13:04:24 +0000
committerBram Moolenaar <Bram@vim.org>2009-09-11 13:04:24 +0000
commitc06620266577d01609a6595d1aaff783f63cdcb0 (patch)
treeacc1b72926dc871b23893cd95cb3587eee8c1462
parentfa68b0fc1a1419d8520fd69586199a1986b2e66f (diff)
downloadvim-git-c06620266577d01609a6595d1aaff783f63cdcb0.tar.gz
updated for version 7.2-254v7.2.254
-rw-r--r--src/fileio.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c
index a9552b558..46d364a67 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4568,7 +4568,7 @@ restore_backup:
c = TRUE;
if (write_info.bw_conv_error_lnum != 0)
{
- int l = STRLEN(IObuff);
+ size_t l = STRLEN(IObuff);
vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
(long)write_info.bw_conv_error_lnum);
}
diff --git a/src/version.c b/src/version.c
index 9d05ca9d1..612f71564 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 254,
+/**/
253,
/**/
252,