From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 7 Jun 2012 19:09:39 +0000 (+0200)
Subject: updated for version 7.3.548
X-Git-Tag: v7.3.548
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27ba0885493243945b16e14056c0a98a3ab14021;p=thirdparty%2Fvim.git

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 ca327b955d..37c6aab48f 100644
--- 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 d07a09cd99..e9f160792b 100644
--- 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,
 /**/