(x_draw_composite_glyph_string_foreground): Don't

increment s->gidx for TAB.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/xterm.c b/src/xterm.c
index e795d22cee9..89fe463e6d1 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1501,7 +1501,7 @@ x_draw_composite_glyph_string_foreground (s)
         }
       else
         {
-          for (i = 0; i < s->nchars; i++, ++s->gidx)
+          for (i = 0; i < s->nchars; i++)
             if (COMPOSITION_GLYPH (s->cmp, s->gidx) != '\t')
               {
                 int xx = x + s->cmp->offsets[s->gidx * 2];
@@ -1510,6 +1510,7 @@ x_draw_composite_glyph_string_foreground (s)
                 font->driver->draw (s, s->gidx, s->gidx + 1, xx, yy, 0);
                 if (s->face->overstrike)
                   font->driver->draw (s, s->gidx, s->gidx + 1, xx + 1, yy, 0);
+                s->gidx++;
               }
         }
     }