summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-07-16 17:29:51 +0200
committerBram Moolenaar <Bram@vim.org>2014-07-16 17:29:51 +0200
commit5524aebf160ac3acef6daf5485c9adc3b5aca92f (patch)
tree56d4ab25892a102b52349d44e6543de3028afd69
parentb5647f71c210cf943192381783e0a7242de9e51c (diff)
downloadvim-git-5524aebf160ac3acef6daf5485c9adc3b5aca92f.tar.gz
updated for version 7.4.371v7.4.371
Problem: When 'linebreak' is set control characters are not correctly displayed. (Kimmy Lindvall) Solution: Set n_extra. (Christian Brabandt)
-rw-r--r--src/screen.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/screen.c b/src/screen.c
index 909a60658..abbd9112d 100644
--- 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 6b730cb68..84bc24a51 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 */
/**/
+ 371,
+/**/
370,
/**/
369,