diff --git a/src/ops.c b/src/ops.c
index 91d3a4b..4a19848 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5009,14 +5009,14 @@
 		    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 d76370f..1db6ae9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    58,
+/**/
     57,
 /**/
     56,