forked from aniani/vim
patch 9.0.0691: lalloc(0) error in listchars test
Problem: lalloc(0) error in listchars test. Solution: Skip generating text for tab if tab_len is zero.
This commit is contained in:
@@ -2802,49 +2802,56 @@ win_line(
|
|||||||
&& wlv.n_extra > tab_len)
|
&& wlv.n_extra > tab_len)
|
||||||
tab_len += wlv.n_extra - tab_len;
|
tab_len += wlv.n_extra - tab_len;
|
||||||
# endif
|
# endif
|
||||||
// If wlv.n_extra > 0, it gives the number of chars, to
|
if (tab_len > 0)
|
||||||
// use for a tab, else we need to calculate the width
|
|
||||||
// for a tab.
|
|
||||||
int tab2_len = mb_char2len(wp->w_lcs_chars.tab2);
|
|
||||||
len = tab_len * tab2_len;
|
|
||||||
if (wp->w_lcs_chars.tab3)
|
|
||||||
len += mb_char2len(wp->w_lcs_chars.tab3) - tab2_len;
|
|
||||||
if (wlv.n_extra > 0)
|
|
||||||
len += wlv.n_extra - tab_len;
|
|
||||||
c = wp->w_lcs_chars.tab1;
|
|
||||||
p = alloc(len + 1);
|
|
||||||
if (p == NULL)
|
|
||||||
wlv.n_extra = 0;
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
vim_memset(p, ' ', len);
|
// If wlv.n_extra > 0, it gives the number of
|
||||||
p[len] = NUL;
|
// chars, to use for a tab, else we need to
|
||||||
vim_free(wlv.p_extra_free);
|
// calculate the width for a tab.
|
||||||
wlv.p_extra_free = p;
|
int tab2_len = mb_char2len(wp->w_lcs_chars.tab2);
|
||||||
for (i = 0; i < tab_len; i++)
|
len = tab_len * tab2_len;
|
||||||
|
if (wp->w_lcs_chars.tab3)
|
||||||
|
len += mb_char2len(wp->w_lcs_chars.tab3)
|
||||||
|
- tab2_len;
|
||||||
|
if (wlv.n_extra > 0)
|
||||||
|
len += wlv.n_extra - tab_len;
|
||||||
|
c = wp->w_lcs_chars.tab1;
|
||||||
|
p = alloc(len + 1);
|
||||||
|
if (p == NULL)
|
||||||
|
wlv.n_extra = 0;
|
||||||
|
else
|
||||||
{
|
{
|
||||||
int lcs = wp->w_lcs_chars.tab2;
|
vim_memset(p, ' ', len);
|
||||||
|
p[len] = NUL;
|
||||||
if (*p == NUL)
|
vim_free(wlv.p_extra_free);
|
||||||
|
wlv.p_extra_free = p;
|
||||||
|
for (i = 0; i < tab_len; i++)
|
||||||
{
|
{
|
||||||
tab_len = i;
|
int lcs = wp->w_lcs_chars.tab2;
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// if tab3 is given, use it for the last char
|
if (*p == NUL)
|
||||||
if (wp->w_lcs_chars.tab3 && i == tab_len - 1)
|
{
|
||||||
lcs = wp->w_lcs_chars.tab3;
|
tab_len = i;
|
||||||
p += mb_char2bytes(lcs, p);
|
break;
|
||||||
wlv.n_extra += mb_char2len(lcs)
|
}
|
||||||
|
|
||||||
|
// if tab3 is given, use it for the last
|
||||||
|
// char
|
||||||
|
if (wp->w_lcs_chars.tab3
|
||||||
|
&& i == tab_len - 1)
|
||||||
|
lcs = wp->w_lcs_chars.tab3;
|
||||||
|
p += mb_char2bytes(lcs, p);
|
||||||
|
wlv.n_extra += mb_char2len(lcs)
|
||||||
- (saved_nextra > 0 ? 1 : 0);
|
- (saved_nextra > 0 ? 1 : 0);
|
||||||
}
|
}
|
||||||
wlv.p_extra = wlv.p_extra_free;
|
wlv.p_extra = wlv.p_extra_free;
|
||||||
# ifdef FEAT_CONCEAL
|
# ifdef FEAT_CONCEAL
|
||||||
// n_extra will be increased by FIX_FOX_BOGUSCOLS
|
// n_extra will be increased by
|
||||||
// macro below, so need to adjust for that here
|
// FIX_FOX_BOGUSCOLS macro below, so need to
|
||||||
if (wlv.vcol_off > 0)
|
// adjust for that here
|
||||||
wlv.n_extra -= wlv.vcol_off;
|
if (wlv.vcol_off > 0)
|
||||||
|
wlv.n_extra -= wlv.vcol_off;
|
||||||
# endif
|
# endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@@ -699,6 +699,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
691,
|
||||||
/**/
|
/**/
|
||||||
690,
|
690,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user