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

Avoid uninitialized variable warning

Browse source 
* src/composite.c (composition_gstring_adjust_zero_width): Simplify
last change with respect to an exit condition.
This commit is contained in:
YAMAMOTO Mitsuharu 2022-09-27 12:39:31 +09:00
parent 51ec68b318
commit 604b541d5c
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/composite.c
View file

@ -815,9 +815,12 @@ composition_gstring_adjust_zero_width (Lisp_Object gstring)
{
Lisp_Object glyph;
if (i == LGSTRING_GLYPH_LEN (gstring)
|| (glyph = LGSTRING_GLYPH (gstring, i),
(NILP (glyph) || from != LGLYPH_FROM (glyph))))
if (i < LGSTRING_GLYPH_LEN (gstring))
glyph = LGSTRING_GLYPH (gstring, i);
else
glyph = Qnil;
if (NILP (glyph) || from != LGLYPH_FROM (glyph))
{
eassert (i > 0);
Lisp_Object last = LGSTRING_GLYPH (gstring, i - 1);
@ -834,7 +837,7 @@ composition_gstring_adjust_zero_width (Lisp_Object gstring)
ASET (LGLYPH_ADJUSTMENT (last), 2,
make_fixnum (LGLYPH_WADJUST (last) + 1));
}
if (i == LGSTRING_GLYPH_LEN (gstring) || NILP (glyph))
if (NILP (glyph))
break;
from = LGLYPH_FROM (glyph);
width = 0;