From: Kenichi Handa <handa@m17n.org>
Date: Thu, 13 Dec 2007 01:33:14 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-23.0.90~8295^2~138
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=47369218a046d88ee8d2a063b4ba7abf60ae23d5;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index 0b0d9e54d7e..24142131fe8 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -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.