# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1339096179 -7200
# Node ID 8625e38066dbf6a4d5e2563fbe191c3910681d2e
# Parent  6f2497d0c277e46ade7c5dd819ab6e482ccb50a7
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
--- a/src/ops.c
+++ b/src/ops.c
@@ -4352,7 +4352,7 @@ do_join(count, insert_space, save_undo, 
 
 		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
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    548,
+/**/
     547,
 /**/
     546,