updated for version 7.4.371

brammool · brammool · commit 2aa6d25bb883 · 2014-07-16T17:29:51.000+02:00
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
@@ -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
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    371,
 /**/
     370,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -4646,6 +4646,8 @@ win_line(wp, lnum, startrow, endrow, nochange)`
`4646`	`4646`	`else if (c != NUL)`
`4647`	`4647`	`{`
`4648`	`4648`	`p_extra = transchar(c);`
	`4649`	`+ if (n_extra == 0)`
	`4650`	`+ n_extra = byte2cells(c) - 1;`
`4649`	`4651`	`#ifdef FEAT_RIGHTLEFT`
`4650`	`4652`	`if ((dy_flags & DY_UHEX) && wp->w_p_rl)`
`4651`	`4653`	`rl_mirror(p_extra); /* reverse "<12>" */`