(x_get_glyph_overhangs): Fix calculation of right

overhang for the static composition case.

diff --git a/src/ChangeLog b/src/ChangeLog
index 37f160a040b1097105597ba746248a9db387db38..d545ac7f2dab5af7c7f43891758f26f71a602f66 100644 (file)
--- 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 eff922e742263312ff76d43ae0f663bb4e0460dc..0f3674433b532e5b35982a87fcc9bcc02444f1ef 100644 (file)
--- 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
        {