[Emacs-diffs] master 5395106: Revert previous change to produce_composite_glyph

[Paul Eggert]

branch: master
commit 5395106b0e8a9ea0c9ad34da6a2231152617d73c
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Revert previous change to produce_composite_glyph
    
    * term.c (produce_composite_glyph): Revert previous change (Bug#19496).
---
 src/ChangeLog |    3 +++
 src/term.c    |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 12852b8..46ab94c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2015-01-03  Paul Eggert  <address@hidden>
 
+       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 74879ec..48447bc 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
     {