From 244ea637244369e2b17496233096813ddf975f2f Mon Sep 17 00:00:00 2001
From: Felipe Morales <hel.sheep@gmail.com>
Date: Sat, 16 Aug 2014 15:20:04 -0400
Subject: vim-patch:7.4.371

Problem:    When 'linebreak' is set control characters are not correctly
displayed. (Kimmy Lindvall)
Solution:   Set n_extra. (Christian Brabandt)
---
 src/nvim/screen.c  | 3 +++
 src/nvim/version.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index f6ee877a66..5eaebfbf7c 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3562,6 +3562,9 @@ win_line (
             mb_utf8 = FALSE;                    /* don't draw as UTF-8 */
         } else if (c != NUL) {
           p_extra = transchar(c);
+          if (n_extra == 0) {
+              n_extra = byte2cells(c);
+          }
           if ((dy_flags & DY_UHEX) && wp->w_p_rl)
             rl_mirror(p_extra);                 /* reverse "<12>" */
           c_extra = NUL;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 6ec6bc0b7e..2c4172d6e0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -224,7 +224,7 @@ static int included_patches[] = {
   //374,
   //373,
   //372,
-  //371,
+  371,
   //370,
   //369,
   //368,
-- 
cgit