Permalink
Browse files

patch 8.0.1220: skipping empty statusline groups is not correct

Problem:    Skipping empty statusline groups is not correct.
Solution:   Also set group_end_userhl. (itchyny)
  • Loading branch information...
brammool committed Oct 26, 2017
1 parent f204e05 commit 235dddf1f4afe3a40047dbf2aca1bd177b7be18b
Showing with 15 additions and 2 deletions.
  1. +7 −2 src/buffer.c
  2. +6 −0 src/testdir/test_statusline.vim
  3. +2 −0 src/version.c
View
@@ -4028,9 +4028,14 @@ build_stl_str_hl(
/* remove group if all items are empty and highlight group
* doesn't change */
group_start_userhl = group_end_userhl = 0;
for (n = 0; n < groupitem[groupdepth]; n++)
for (n = groupitem[groupdepth] - 1; n >= 0; n--)
{
if (item[n].type == Highlight)
group_start_userhl = item[n].minwid;
{
group_start_userhl = group_end_userhl = item[n].minwid;
break;
}
}
for (n = groupitem[groupdepth] + 1; n < curitem; n++)
{
if (item[n].type == Normal)
@@ -312,6 +312,12 @@ func Test_statusline()
call assert_equal(sa1, sa3)
call assert_equal(sa1, sa4)
let g:a = ''
set statusline=%#Error#{%(\ %{g:a}\ %)}
call assert_match('^{}\s*$', s:get_statusline())
let g:a = 'X'
call assert_match('^{ X }\s*$', s:get_statusline())
" %%: a percent sign.
set statusline=10%%
call assert_match('^10%\s*$', s:get_statusline())
View
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1220,
/**/
1219,
/**/

0 comments on commit 235dddf

Please sign in to comment.