diff --git a/src/misc1.c b/src/misc1.c
index b894d0d..97e29c2 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -6433,6 +6433,8 @@
 	/* find how indented the line beginning the comment is */
 	getvcol(curwin, trypos, &col, NULL, NULL);
 	amount = col;
+	*lead_start = NUL;
+	*lead_middle = NUL;
 
 	p = curbuf->b_p_com;
 	while (*p != NUL)
diff --git a/src/version.c b/src/version.c
index 485073c..77cd010 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    158,
+/**/
     157,
 /**/
     156,