mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-24 13:32:41 -08:00
Code Issues Projects Releases Wiki Activity

Pacify x86 GCC 9 in tab bar code

Browse source 
* src/xdisp.c (tty_get_tab_bar_item): Simplify a bit.  This
pacifies --enable-gcc-warnings with x86 GCC 9.2.1 20190827
(Red Hat 9.2.1-1) when combined with -fsanitize=undefined.
This commit is contained in:
Paul Eggert 2019-10-18 15:33:13 -07:00
parent f60ed6e3e4
commit f9744a5f09
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/xdisp.c
View file

@ -13419,26 +13419,22 @@ static Lisp_Object
tty_get_tab_bar_item (struct frame *f, int x, int *idx, ptrdiff_t *end)
{
ptrdiff_t clen = 0;
Lisp_Object caption;
int i, j;
for (i = 0, j = 0; i < f->n_tab_bar_items; i++, j += TAB_BAR_ITEM_NSLOTS)
for (int i = 0; i < f->n_tab_bar_items; i++)
{
caption = AREF (f->tab_bar_items, j + TAB_BAR_ITEM_CAPTION);
Lisp_Object caption = AREF (f->tab_bar_items, (i * TAB_BAR_ITEM_NSLOTS
+ TAB_BAR_ITEM_CAPTION));
if (NILP (caption))
return Qnil;
clen += SCHARS (caption);
if (x < clen)
break;
{
*idx = i;
*end = clen;
return caption;
}
}
if (i < f->n_tab_bar_items)
{
*idx = i;
*end = clen;
return caption;
}
else
return Qnil;
return Qnil;
}
/* Handle a mouse click at X/Y on the tab bar of TTY frame F. If the