# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1228480018 0
# Node ID 422df56f8807a4644bf338f10cb2d8e11e387d65
# Parent  7d98fd5b386797a7032609e5e69faeac90c67d9b
*** empty log message ***

diff -r 7d98fd5b3867 -r 422df56f8807 src/ChangeLog
--- a/src/ChangeLog	Fri Dec 05 12:24:58 2008 +0000
+++ b/src/ChangeLog	Fri Dec 05 12:26:58 2008 +0000
@@ -1,3 +1,8 @@
+2008-12-05  Kenichi Handa  <handa@m17n.org>
+
+	* ftfont.c (ftfont_shape_by_flt): Use "combining" flt if the
+	second character is a combining character.
+
 2008-12-05  Eli Zaretskii  <eliz@gnu.org>
 
 	* process.c (procfs_system_process_attributes): Don't use cmd,
@@ -23,6 +28,7 @@
 
 	* coding.c (decode_coding_charset): Check type of an element of
 	vector VALIDS.
+	(encode_coding_emacs_mule): Be sure to set `code'.
 
 	* fontset.c (face_for_char): Handle invalid charset property
 	correctly.