changeset 5415:fa8447ec5823 v7.4.058

updated for version 7.4.058 Problem: Warnings on 64 bit Windows. Solution: Add type casts. (Mike Williams)
author Bram Moolenaar <bram@vim.org>
date Sat, 02 Nov 2013 23:59:35 +0100
parents 68331356e02e
children c2165840cbf2
files src/ops.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ops.c
+++ b/src/ops.c
@@ -5009,14 +5009,14 @@ format_lines(line_count, avoid_fex)
 		    if (second_indent > 0)  /* the "leader" for FO_Q_SECOND */
 		{
 		    char_u *p = ml_get_curline();
-		    int indent = skipwhite(p) - p;
+		    int indent = (int)(skipwhite(p) - p);
 
 		    if (indent > 0)
 		    {
 			(void)del_bytes(indent, FALSE, FALSE);
 			mark_col_adjust(curwin->w_cursor.lnum,
 					       (colnr_T)0, 0L, (long)-indent);
-		      }
+		    }
 		}
 		curwin->w_cursor.lnum--;
 		if (do_join(2, TRUE, FALSE, FALSE) == FAIL)
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    58,
+/**/
     57,
 /**/
     56,