diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2022-09-27 12:39:31 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2022-09-27 12:39:31 +0900 |
| commit | 604b541d5ce394a1e4f157a81a0cf77df98d61d0 (patch) | |
| tree | d82e795a6c15a32811b096a698aa278d3890ff99 /src/composite.c | |
| parent | 51ec68b3182914c6c95d6ddcd88ae75239ec2904 (diff) | |
| download | emacs-604b541d5ce394a1e4f157a81a0cf77df98d61d0.tar.gz emacs-604b541d5ce394a1e4f157a81a0cf77df98d61d0.tar.bz2 emacs-604b541d5ce394a1e4f157a81a0cf77df98d61d0.zip | |
Avoid uninitialized variable warning
* src/composite.c (composition_gstring_adjust_zero_width): Simplify
last change with respect to an exit condition.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/composite.c b/src/composite.c index 0417bc866d4..6b256171ac7 100644 --- a/src/composite.c +++ b/src/composite.c @@ -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; |