patch 9.0.0642: breakindent test fails

Problem:    Breakindent test fails.
Solution:   Correct logic for resetting need_showbreak.

diff --git a/src/drawline.c b/src/drawline.c
index ccfc8a49c1b3b4229d3f4f960d97cff08452878d..79ce5140e95549bbf053fd926fc0a6c3d6c9ddd7 100644 (file)
--- 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 09f4757dcc7070532cd2b2ce2800bb0f5ab8e82b..786a866bfd1854b83c7e39a06d4df2587689e81f 100644 (file)
--- 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,
 /**/