# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1270897186 -32400
# Node ID 834292200403193d79e73d80e878e7f89c6bb8a5
# Parent  c7670de45d8a85507527e2ebb1c84e593153492b
xfns.c (Fx_show_tip): Subtract last glyph's width only when it is for padding.

diff -r c7670de45d8a -r 834292200403 src/ChangeLog
--- a/src/ChangeLog	Sat Apr 10 19:52:30 2010 +0900
+++ b/src/ChangeLog	Sat Apr 10 19:59:46 2010 +0900
@@ -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  <jan.h.d@swipnet.se>
 
diff -r c7670de45d8a -r 834292200403 src/xfns.c
--- a/src/xfns.c	Sat Apr 10 19:52:30 2010 +0900
+++ b/src/xfns.c	Sat Apr 10 19:59:46 2010 +0900
@@ -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);