Mercurial > vim
diff src/screen.c @ 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 | 9ca8c36869ce |
| children | 0a69e6e708f9 |
line wrap: on
line diff
--- 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);