procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid inflooping when 'tab-bar-format' includes embedded newlines

Browse source 
* src/xdisp.c (tab_bar_height, redisplay_tab_bar): Support
'tab-bar-format' with embedded newlines.  (Bug#52947)
This commit is contained in:
Eli Zaretskii 2022-01-02 21:36:13 +02:00
parent 83da3a09d0
commit 6e53178a37
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xdisp.c
View file

@ -13508,11 +13508,15 @@ tab_bar_height (struct frame *f, int *n_rows, bool pixelwise)
0, 0, 0, STRING_MULTIBYTE (f->desired_tab_bar_string));
it.paragraph_embedding = L2R;
clear_glyph_row (temp_row);
while (!ITERATOR_AT_END_P (&it))
{
clear_glyph_row (temp_row);
it.glyph_row = temp_row;
display_tab_bar_line (&it, -1);
/* If the tab-bar string includes newlines, get past it, because
display_tab_bar_line doesn't. */
if (ITERATOR_AT_END_OF_LINE_P (&it))
set_iterator_to_next (&it, true);
}
clear_glyph_row (temp_row);
@ -13638,6 +13642,10 @@ redisplay_tab_bar (struct frame *f)
extra -= h;
}
display_tab_bar_line (&it, height + h);
/* If the tab-bar string includes newlines, get past it,
because display_tab_bar_line doesn't. */
if (ITERATOR_AT_END_OF_LINE_P (&it))
set_iterator_to_next (&it, true);
}
}
else