updated for version 7.3.548

Problem:    Compiler warning on 64 bit Windows.
Solution:   Add type cast. (Mike Williams)

diff --git a/src/ops.c b/src/ops.c
index ca327b955dc256bacfbd84c1e3b4ee15a3f09741..37c6aab48f0263110c77f267225ca82e0bfe24ba 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -4352,7 +4352,7 @@ do_join(count, insert_space, save_undo, use_formatoptions)
 
                char_u *new_curr = skip_comment(curr, TRUE, insert_space,
                                                           &prev_was_comment);
-               comments[t] = new_curr - curr;
+               comments[t] = (int)(new_curr - curr);
                curr = new_curr;
            }
            else

diff --git a/src/version.c b/src/version.c
index d07a09cd993dd93e8607a5074a922da261c69abe..e9f160792bff7d9cd03b6ab6ec5aa3b5775ffda5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    548,
 /**/
     547,
 /**/