updated for version 7.2-254

diff --git a/src/fileio.c b/src/fileio.c
index a9552b558b79385b2b704c50cdba7d938326d65e..46d364a67e816e566c89e009fece6e91723a2d3d 100644 (file)
--- 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 9d05ca9d144be34a7e60645e2db283a653515308..612f715649973a5eb2b0a3b475d95b058035bc65 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    254,
 /**/
     253,
 /**/