updated for version 7.4.058

Problem:    Warnings on 64 bit Windows.
Solution:   Add type casts. (Mike Williams)

diff --git a/src/ops.c b/src/ops.c
index 91d3a4b0ff32900111bc83283b2e55f81b5a68d3..4a198487cc42865934f6d4d21281e2ba3a0df646 100644 (file)
--- 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)

diff --git a/src/version.c b/src/version.c
index d76370f600d08893bbf1472e65cc92e4bda809cd..1db6ae92d610bd06022e1d936a27c9b72cd77743 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    58,
 /**/
     57,
 /**/