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 12852b89b12aeb171b0026b55f563402948b5d32..46ab94c7c89c1e3c91c985ef8ce40060bd773c26 100644 (file)
--- 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 74879ecc3f5d27b1fc8400b2cc11340bde57356e..48447bce5fd5a1b28ea0ea11c3095e8b27b249f7 100644 (file)
--- 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
     {