# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1197509594 0
# Node ID b9bdb93e544d097980ae72201f2a5e2b82af7baf
# Parent  e2f99a24f1e660b80053fbd055031616cfdecd2f
*** empty log message ***

diff -r e2f99a24f1e6 -r b9bdb93e544d src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Thu Dec 13 01:32:44 2007 +0000
+++ b/src/ChangeLog.unicode	Thu Dec 13 01:33:14 2007 +0000
@@ -1,5 +1,16 @@
+2007-12-13  Kenichi Handa  <handa@ni.aist.go.jp>
+
+	* xdisp.c (handle_auto_composed_prop): Use Fget_text_property
+	instead of get_property_and_range.
+
 2007-12-10  Kenichi Handa  <handa@ni.aist.go.jp>
 
+	* xftfont.c (struct xftfont_info): Delete the member ft_face.
+	(xftfont_open): Don't keep locking face.
+	(xftfont_close): Don't unlock face.
+	(xftfont_anchor_point): Lock and unlock face.
+	(xftfont_shape): Likewise.
+
 	* fontset.c (fontset_find_font): Don't prefer a font of
 	supplementary charset.