diff --git a/src/textformat.c b/src/textformat.c
index 7ebbc8849a..3447a0a0e1 100644
--- a/src/textformat.c
+++ b/src/textformat.c
@@ -540,9 +540,6 @@ same_leader(
     if (leader1_len == 0)
 	return (leader2_len == 0);
 
-    char_u  *lnum_line = NULL;
-    int	    line_len = 0;
-
     // If first leader has 'f' flag, the lines can be joined only if the
     // second line does not have a leader.
     // If first leader has 'e' flag, the lines can never be joined.
@@ -558,11 +555,7 @@ same_leader(
 		return FALSE;
 	    if (*p == COM_START)
 	    {
-		if (lnum_line == NULL)
-		{
-		    lnum_line = ml_get(lnum);
-		    line_len = (int)STRLEN(lnum_line);
-		}
+		int line_len = (int)STRLEN(ml_get(lnum));
 		if (line_len <= leader1_len)
 		    return FALSE;
 		if (leader2_flags == NULL || leader2_len == 0)
diff --git a/src/version.c b/src/version.c
index 3e853b3093..886d0a4dfc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1236,
 /**/
     1235,
 /**/