X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/36e69bd82a0294b1f51d99a5eaf8e2c7661f7a16..49f7c5ad68cb9c542cfddee7bed17d207f1fc394:/src/xdisp.c

diff --git a/src/xdisp.c b/src/xdisp.c
index d5ffb25eb1..efd5f54fa3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2237,7 +2237,7 @@ get_phys_cursor_geometry (struct window *w, struct glyph_row *row,
   ascent = row->ascent;
   if (row->ascent < glyph->ascent)
     {
-      y =- glyph->ascent - row->ascent;
+      y -= glyph->ascent - row->ascent;
       ascent = glyph->ascent;
     }
 
@@ -27369,8 +27369,8 @@ x_produce_glyphs (struct it *it)
 
 	  eassume (0 < glyph_len); /* See Bug#8512.  */
 	  do
-	    c = COMPOSITION_GLYPH (cmp, --glyph_len);
-	  while (c == '\t' && 0 < glyph_len);
+	    c = COMPOSITION_GLYPH (cmp, glyph_len - 1);
+	  while (c == '\t' && 0 < --glyph_len);
 
 	  bool right_padded = glyph_len < cmp->glyph_len;
 	  for (i = 0; i < glyph_len; i++)