From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 11 Jul 2016 14:18:11 +0000 (+0300)
Subject: Fix display of composed characters
X-Git-Tag: emacs-26.0.90~1840^2~79
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=10cfb736e2d32bd2604dc93a979ce136473b5944;p=emacs.git

Fix display of composed characters

* src/xdisp.c (x_produce_glyphs): Fix off-by-one error in
iteration through composition glyphs.  (Bug#23938)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index d5ffb25eb18..14d6f8fcf93 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -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++)