(ftfont_shape_by_flt): Use "combining" flt if the

second character is a combining character.

src/ChangeLog

+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.

src/ftfont.c

@@ -1866,7 +1866,8 @@ ftfont_shape_by_flt (lgstring, font, ft_face, otf)
   flt_font_ft.font = font;
   flt_font_ft.ft_face = ft_face;
   flt_font_ft.otf = otf;
-  if (ASCII_CHAR_P (gstring.glyphs[0].c))
+  if (len > 1
+      && gstring.glyphs[1].c >= 0x300 && gstring.glyphs[1].c <= 0x36F)
     /* A little bit ad hoc.  Perhaps, shaper must get script and
        language information, and select a proper flt for them
        here.  */