diff --git a/src/charset.c b/src/charset.c
index b55468fbdc..72838d0f95 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -771,7 +771,7 @@ win_linetabsize(win_T *wp, linenr_T lnum, char_u *line, colnr_T len)
     chartabsize_T cts;
 
     init_chartabsize_arg(&cts, wp, lnum, 0, line, line);
-    cts.cts_with_trailing = len = MAXCOL;
+    cts.cts_with_trailing = len == MAXCOL;
     for ( ; *cts.cts_ptr != NUL && (len == MAXCOL || cts.cts_ptr < line + len);
 						      MB_PTR_ADV(cts.cts_ptr))
 	cts.cts_vcol += win_lbr_chartabsize(&cts, NULL);
diff --git a/src/version.c b/src/version.c
index af52ab853e..aed14f067a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    122,
 /**/
     121,
 /**/