From 5395106b0e8a9ea0c9ad34da6a2231152617d73c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 3 Jan 2015 14:37:05 -0800 Subject: [PATCH] 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 deletion(-) 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 + 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 { -- 2.39.2