patch 7.4.845

Problem:    Compiler warning for possible loss of data.
Solution:   Add a type cast. (Erich Ritz)

diff --git a/src/misc1.c b/src/misc1.c
index ee2da0887bead2965a125d6c2d33653b9538beda..8b5ea647e8e99cb29267a665cb467f664342cd49 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -3985,7 +3985,7 @@ expand_env_esc(srcp, dst, dstlen, esc, one, startstr)
                len = dstlen;
            vim_strncpy(dst, var, len);
            dst += len;
-           dstlen -= len;
+           dstlen -= (int)len;
            continue;
        }
 #endif

diff --git a/src/version.c b/src/version.c
index dadec6a1eae50c5083f4ae4f62eb314e5a84fd9e..7e464a58f4b8cbc25ccf7a084d5ccd6cf2f6d227 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    845,
 /**/
     844,
 /**/