Permalink
Browse files

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)
  • Loading branch information...
brammool committed Jun 25, 2018
1 parent b7a5ab1 commit a87b72cc316e065d66dcbcf7ec1cde330adef3a3
Showing with 32 additions and 0 deletions.
  1. +5 −0 src/screen.c
  2. +25 −0 src/testdir/test_vartabs.vim
  3. +2 −0 src/version.c
@@ -4753,8 +4753,13 @@ win_line(
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 : ' ';
@@ -4,6 +4,11 @@ if !has("vartabs")
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 @@ func! Test_vartabs_breakindent()
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
@@ -789,6 +789,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
116,
/**/
115,
/**/

0 comments on commit a87b72c

Please sign in to comment.