diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-03 14:37:05 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-03 14:37:32 -0800 |
| commit | 5395106b0e8a9ea0c9ad34da6a2231152617d73c (patch) | |
| tree | dc42c4a367febdf5461108341cde78f8c9f85862 | |
| parent | 8bef7b6ad1775124eeed81acf46551c0fc3aa75e (diff) | |
| download | emacs-5395106b0e8a9ea0c9ad34da6a2231152617d73c.tar.gz | |
Revert previous change to produce_composite_glyph
* term.c (produce_composite_glyph): Revert previous change (Bug#19496).
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/term.c | 2 |
2 files changed, 4 insertions, 1 deletions
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 { |