From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 3 Jan 2015 22:37:05 +0000 (-0800)
Subject: Revert previous change to produce_composite_glyph
X-Git-Tag: emacs-25.0.90~2611^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5395106b0e8a9ea0c9ad34da6a2231152617d73c;p=emacs.git

Revert previous change to produce_composite_glyph

* term.c (produce_composite_glyph): Revert previous change (Bug#19496).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 12852b89b12..46ab94c7c89 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2015-01-03  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Revert previous change to produce_composite_glyph
+	* term.c (produce_composite_glyph): Revert previous change (Bug#19496).
+
 	Pacify gcc -Wparentheses
 	* frame.c (x_set_frame_parameters): Add parens (Bug#19428).
 
diff --git a/src/term.c b/src/term.c
index 74879ecc3f5..48447bce5fd 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1736,7 +1736,7 @@ produce_composite_glyph (struct it *it)
     {
       struct composition *cmp = composition_table[it->cmp_it.id];
 
-      it->pixel_width = cmp->pixel_width;
+      it->pixel_width = cmp->width;
     }
   else
     {