diff options
| author | Kenichi Handa <handa@m17n.org> | 2009-06-11 02:34:57 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2009-06-11 02:34:57 +0000 |
| commit | 5753e4da2b6abed72700f61ffa94c9a99ceb404b (patch) | |
| tree | b06fb32568e62d300b0155edfedecba3d97a5c29 | |
| parent | a431c5f4a2630123f502cd3e93e2bc6535f15dba (diff) | |
| download | emacs-5753e4da2b6abed72700f61ffa94c9a99ceb404b.tar.gz | |
(x_get_glyph_overhangs): Fix calculation of right
overhang for the static composition case.
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 37f160a040b..d545ac7f2da 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,13 @@ +2009-06-11 Kenichi Handa <handa@m17n.org> + + * xdisp.c (x_get_glyph_overhangs): Fix calculation of right + overhang for the static composition case. + 2009-06-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + * xdisp.c (x_get_glyph_overhangs): Fix calculation of right + overhang for the automatic composition case. + * xterm.c (x_compute_glyph_string_overhangs): Handle the automatic composition case. diff --git a/src/xdisp.c b/src/xdisp.c index eff922e7422..0f3674433b5 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -19913,10 +19913,10 @@ x_get_glyph_overhangs (glyph, f, left, right) { struct composition *cmp = composition_table[glyph->u.cmp.id]; - if (cmp->rbearing - cmp->pixel_width) + if (cmp->rbearing > cmp->pixel_width) *right = cmp->rbearing - cmp->pixel_width; - if (cmp->lbearing < 0); - *left = - cmp->lbearing; + if (cmp->lbearing < 0) + *left = - cmp->lbearing; } else { |