[Emacs-diffs] /srv/bzr/emacs/trunk r99864: xfns.c (Fx_show_tip): Subtract last glyph's width only when it is for padding.

[YAMAMOTO Mitsuharu]

------------------------------------------------------------
revno: 99864
committer: YAMAMOTO Mitsuharu <address@hidden>
branch nick: trunk
timestamp: Sat 2010-04-10 19:59:46 +0900
message:
  xfns.c (Fx_show_tip): Subtract last glyph's width only when it is for padding.
modified:
  src/ChangeLog
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-10 10:52:30 +0000
+++ b/src/ChangeLog     2010-04-10 10:59:46 +0000
@@ -9,7 +9,8 @@
        TRY_WINDOW_CHECK_MARGINS.
 
        * xfns.c (Fx_show_tip): Undo last change.  Call try_window with
-       TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423).
+       TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423).  Subtract last glyph's
+       width only when it is for padding.
 
 2010-04-09  Jan Djärv  <address@hidden>
 

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2010-04-10 10:52:30 +0000
+++ b/src/xfns.c        2010-04-10 10:59:46 +0000
@@ -5245,15 +5245,15 @@
       /* Let the row go over the full width of the frame.  */
       row->full_width_p = 1;
 
+      row_width = row->pixel_width;
       /* There's a glyph at the end of rows that is used to place
         the cursor there.  Don't include the width of this glyph.  */
       if (row->used[TEXT_AREA])
        {
          last = &row->glyphs[TEXT_AREA][row->used[TEXT_AREA] - 1];
-         row_width = row->pixel_width - last->pixel_width;
+         if (INTEGERP (last->object))
+           row_width -= last->pixel_width;
        }
-      else
-       row_width = row->pixel_width;
 
       height += row->height;
       width = max (width, row_width);