# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1149241194 0
# Node ID 1e8648fd980ada52aa1a3b8c75726bcce67ffc00
# Parent  93891551768089c74bb12cbd6530f90318c39e3c
*** empty log message ***

diff -r 938915517680 -r 1e8648fd980a src/ChangeLog
--- a/src/ChangeLog	Fri Jun 02 09:39:43 2006 +0000
+++ b/src/ChangeLog	Fri Jun 02 09:39:54 2006 +0000
@@ -1,3 +1,11 @@
+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.