updated for version 7.4.371

Problem:    When 'linebreak' is set control characters are not correctly
            displayed. (Kimmy Lindvall)
Solution:   Set n_extra. (Christian Brabandt)

diff --git a/src/screen.c b/src/screen.c
index 909a60658c0970efc5c22698a71fe8994e03cfbe..abbd9112d36d256ec9d7398e1b7c1470f2c4b8eb 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -4646,6 +4646,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
                else if (c != NUL)
                {
                    p_extra = transchar(c);
+                   if (n_extra == 0)
+                       n_extra = byte2cells(c) - 1;
 #ifdef FEAT_RIGHTLEFT
                    if ((dy_flags & DY_UHEX) && wp->w_p_rl)
                        rl_mirror(p_extra);     /* reverse "<12>" */

diff --git a/src/version.c b/src/version.c
index 6b730cb6885482c2dbaa86df9e20adaf6f1838b7..84bc24a514c2c90b5bf9c8f27dafe7aa0ba4492b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    371,
 /**/
     370,
 /**/