vim-patch:7.4.388

Problem:    With 'linebreak' set and 'list' unset a Tab is not counted
            properly. (Kent Sibilev)
Solution:   Check the 'list' option. (Christian Brabandt)

src/nvim/screen.c

@@ -3461,7 +3461,7 @@ win_line (
           /* tab amount depends on current column */
           tab_len = (int)wp->w_buffer->b_p_ts
                     - vcol % (int)wp->w_buffer->b_p_ts - 1;
-          if (!wp->w_p_lbr) {
+          if (!wp->w_p_lbr || !wp->w_p_list) {
             n_extra = tab_len;
           } else {
             char_u *p;

src/nvim/testdir/test_listlbr_utf8.in

@@ -30,11 +30,22 @@ STARTTEST
 :redraw!
 :let line=ScreenChar(winwidth(0))
 :call DoRecordScreen()
+:"
 :let g:test ="Test 2: set nolinebreak list"
 :set list nolinebreak
 :redraw!
 :let line=ScreenChar(winwidth(0))
 :call DoRecordScreen()
+:"
+:let g:test ="Test 3: set linebreak nolist"
+:$put =\"\t*mask = nil;\"
+:$
+:norm! zt
+:set nolist linebreak
+:redraw!
+:let line=ScreenChar(winwidth(0))
+:call DoRecordScreen()
+:"
 :%w! test.out
 :qa!
 ENDTEST

src/nvim/testdir/test_listlbr_utf8.ok

@@ -12,3 +12,10 @@ Test 2: set nolinebreak list
 +pqrstuvwxyz␣1060ABC
 +DEFGHIJKLMNOPˑ¶    
 ¶                   
+	*mask = nil;
+
+Test 3: set linebreak nolist
+    *mask = nil;    
+~                   
+~                   
+~                   

src/nvim/version.c

@@ -207,7 +207,7 @@ static int included_patches[] = {
   //391,
   //390,
   //389,
-  //388,
+  388,
   //387,
   //386,
   //385,