aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.1.0126: various problems with 'vartabstop'

Browse Source 
Problem:    Various problems with 'vartabstop'.
Solution:   Fix memory leak.  Fix crash. Add a few more tests. (Christian
            Brabandt, closes #3076)
This commit is contained in:
Bram Moolenaar
2018-06-28 22:23:00 +02:00
parent 630afe889a
commit 307ac5c68e
5 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/screen.c
View File

@@ -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);