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)
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 : ' ';
diff --git a/src/testdir/test_vartabs.vim b/src/testdir/test_vartabs.vim
index 85914f6..581ff8b 100644
--- a/src/testdir/test_vartabs.vim
+++ b/src/testdir/test_vartabs.vim
@@ -4,6 +4,11 @@
finish
endif
+source view_util.vim
+function! s:compare_lines(expect, actual)
+ call assert_equal(join(a:expect, "\n"), join(a:actual, "\n"))
+endfunction
+
func! Test_vartabs()
new
%d
@@ -255,3 +260,23 @@
bwipeout!
endfunc
+
+func! Test_vartabs_linebreak()
+ if winwidth(0) < 80
+ return
+ endif
+ new
+ 70vnew
+ %d
+ setl linebreak vartabstop=10,15,20,40
+ call setline(1, "\tx\tx\tx\tx")
+
+ let lines = ScreenLines([1, 2], winwidth(0))
+ let expect = [' x x x ',
+ \ ' x ']
+ call s:compare_lines(expect, lines)
+
+ " cleanup
+ bw!
+ bw!
+endfunc
diff --git a/src/version.c b/src/version.c
index fa4ec60..ffa6bf3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -790,6 +790,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 116,
+/**/
115,
/**/
114,