diff --git a/src/drawline.c b/src/drawline.c
index ccfc8a49c1..79ce5140e9 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -541,7 +541,7 @@ handle_showbreak_and_filler(win_T *wp, winlinevars_T *wlv)
 	wlv->c_extra = NUL;
 	wlv->c_final = NUL;
 	wlv->n_extra = (int)STRLEN(sbr);
-	if ((wp->w_skipcol == 0 && wlv->startrow == 0) || !wp->w_p_wrap)
+	if (wp->w_skipcol == 0 || wlv->startrow != 0 || !wp->w_p_wrap)
 	    wlv->need_showbreak = FALSE;
 	wlv->vcol_sbr = wlv->vcol + MB_CHARLEN(sbr);
 	// Correct end of highlighted area for 'showbreak',
diff --git a/src/version.c b/src/version.c
index 09f4757dcc..786a866bfd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    642,
 /**/
     641,
 /**/