(next_element_from_composition): Set it->object to

it->string if composition is coming from string.
(set_cursor_from_row): Don't return 0 unless row displays a
continued line.
(dump_glyph): Dump composite glyph.

src/ChangeLog

+2006-06-02  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* xdisp.c (next_element_from_composition): Set it->object to
+	it->string if composition is coming from string.
+	(set_cursor_from_row): Don't return 0 unless row displays a
+	continued line.
+	(dump_glyph): Dump composite glyph.
+	
 2006-06-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 	* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.

src/xdisp.c

@@ -6238,6 +6238,8 @@ next_element_from_composition (it)
   it->position = (STRINGP (it->string)
 		  ? it->current.string_pos
 		  : it->current.pos);
+  if (STRINGP (it->string))
+    it->object = it->string;
   return 1;
 }
@@ -11777,7 +11779,7 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
       /* If we reached the end of the line, and end was from a string,
 	 cursor is not on this line.  */
-      if (glyph == end)
+      if (glyph == end && row->continued_p)
 	return 0;
     }
@@ -14961,6 +14963,25 @@ dump_glyph (row, glyph, area)
 	       glyph->left_box_line_p,
 	       glyph->right_box_line_p);
     }
+  else if (glyph->type == COMPOSITE_GLYPH)
+    {
+      fprintf (stderr,
+	       "  %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+	       glyph - row->glyphs[TEXT_AREA],
+	       '+',
+	       glyph->charpos,
+	       (BUFFERP (glyph->object)
+		? 'B'
+		: (STRINGP (glyph->object)
+		   ? 'S'
+		   : '-')),
+	       glyph->pixel_width,
+	       glyph->u.cmp_id,
+	       '.',
+	       glyph->face_id,
+	       glyph->left_box_line_p,
+	       glyph->right_box_line_p);
+    }
 }