Mercurial > vim
changeset 14218:539b070778b0 v8.1.0126
patch 8.1.0126: various problems with 'vartabstop'
commit https://github.com/vim/vim/commit/307ac5c68e9e624ab713136d79f35bb73f780d2d
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jun 28 22:23:00 2018 +0200
patch 8.1.0126: various problems with 'vartabstop'
Problem: Various problems with 'vartabstop'.
Solution: Fix memory leak. Fix crash. Add a few more tests. (Christian
Brabandt, closes #3076)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 28 Jun 2018 22:30:06 +0200 |
| parents | 30af25836c8d |
| children | 8a60fc26fdf0 |
| files | src/ex_cmds.c src/option.c src/screen.c src/testdir/test_vartabs.vim src/version.c |
| diffstat | 5 files changed, 39 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -866,7 +866,6 @@ ex_retab(exarg_T *eap) { set_string_option_direct((char_u *)"vts", -1, new_ts_str, OPT_FREE|OPT_LOCAL, 0); - vim_free(new_ts_str); curbuf->b_p_vts_array = new_vts_array; vim_free(old_vts_ary); } @@ -877,6 +876,7 @@ ex_retab(exarg_T *eap) curbuf->b_p_ts = tabstop_first(new_vts_array); vim_free(new_vts_array); } + vim_free(new_ts_str); } #else curbuf->b_p_ts = new_ts;
--- a/src/option.c +++ b/src/option.c @@ -12870,7 +12870,7 @@ tabstop_start(colnr_T col, int ts, int * tabstop_fromto( colnr_T start_col, colnr_T end_col, - int ts, + int ts_arg, int *vts, int *ntabs, int *nspcs) @@ -12880,12 +12880,14 @@ tabstop_fromto( int padding = 0; int tabcount; int t; + int ts = ts_arg == 0 ? curbuf->b_p_ts : ts_arg; if (vts == NULL || vts[0] == 0) { int tabs = 0; - int initspc = ts - (start_col % ts); - + int initspc = 0; + + initspc = ts - (start_col % ts); if (spaces >= initspc) { spaces -= initspc;
--- a/src/screen.c +++ b/src/screen.c @@ -4753,13 +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 +# ifdef FEAT_VARTABS n_extra = tabstop_padding(vcol, wp->w_buffer->b_p_ts, - wp->w_buffer->b_p_vts_array) - 1; -#else + 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 +# endif # ifdef FEAT_MBYTE c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; @@ -4902,6 +4902,11 @@ win_line( p_extra_free = p; for (i = 0; i < tab_len; i++) { + if (*p == NUL) + { + tab_len = i; + break; + } #ifdef FEAT_MBYTE mb_char2bytes(lcs_tab2, p); p += mb_char2len(lcs_tab2);
--- a/src/testdir/test_vartabs.vim +++ b/src/testdir/test_vartabs.vim @@ -262,21 +262,37 @@ func! Test_vartabs_breakindent() endfunc func! Test_vartabs_linebreak() - if winwidth(0) < 80 + if winwidth(0) < 40 return endif new - 70vnew + 40vnew %d - setl linebreak vartabstop=10,15,20,40 + setl linebreak vartabstop=10,20,30,40 call setline(1, "\tx\tx\tx\tx") - let lines = ScreenLines([1, 2], winwidth(0)) - let expect = [' x x x ', - \ ' x '] + let expect = [' x ', + \ 'x x ', + \ 'x '] + let lines = ScreenLines([1, 3], winwidth(0)) + call s:compare_lines(expect, lines) + setl list listchars=tab:>- + let expect = ['>---------x>------------------ ', + \ 'x>------------------x>------------------', + \ 'x '] + let lines = ScreenLines([1, 3], winwidth(0)) + call s:compare_lines(expect, lines) + setl linebreak vartabstop=40 + let expect = ['>---------------------------------------', + \ 'x>--------------------------------------', + \ 'x>--------------------------------------', + \ 'x>--------------------------------------', + \ 'x '] + let lines = ScreenLines([1, 5], winwidth(0)) call s:compare_lines(expect, lines) " cleanup bw! bw! + set nolist listchars&vim endfunc