commit a87b72cc316e065d66dcbcf7ec1cde330adef3a3
author Bram Moolenaar <Bram@vim.org> Mon Jun 25 21:24:51 2018 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jun 25 21:24:51 2018 +0200
tree ba5b5e3e7fd4d6ce94875ef246104b387a8ee633
parent b7a5ab112ab2267c54acdb6a326642afcd797bc4

patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'

Problem:    Display problem with 'vartabstop' and 'linebreak'. (Chauca
            Fuentes)
Solution:   Call tabstop_padding(). (Christian Brabandt, closes #3076)

src/screen.c

diff --git a/src/screen.c b/src/screen.c
index eac50c5..c03443f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4753,8 +4753,13 @@
 		    n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol,
 								    NULL) - 1;
 		    if (c == TAB && n_extra + col > wp->w_width)
+#ifdef FEAT_VARTABS
+			n_extra = tabstop_padding(vcol, wp->w_buffer->b_p_ts,
+					wp->w_buffer->b_p_vts_array) - 1;
+#else
 			n_extra = (int)wp->w_buffer->b_p_ts
 				       - vcol % (int)wp->w_buffer->b_p_ts - 1;
+ #endif
 
 # ifdef FEAT_MBYTE
 		    c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' ';