changeset 3576:8625e38066db v7.3.548

updated for version 7.3.548 Problem: Compiler warning on 64 bit Windows. Solution: Add type cast. (Mike Williams)
author Bram Moolenaar <bram@vim.org>
date Thu, 07 Jun 2012 21:09:39 +0200
parents 6f2497d0c277
children bda6f7203606
files src/ops.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,