[Emacs-diffs] Changes to emacs/src/ChangeLog,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/09/01 05:34:17

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.6936
retrieving revision 1.6937
diff -u -b -r1.6936 -r1.6937
--- ChangeLog   31 Aug 2008 19:41:40 -0000      1.6936
+++ ChangeLog   1 Sep 2008 05:34:15 -0000       1.6937
@@ -1,3 +1,13 @@
+2008-09-01  Kenichi Handa  <address@hidden>
+
+       * ftfont.c (ftfont_spec_pattern): Don't create a charset of the
+       representative chars of the script is a vector.
+       (ftfont_list): Handle the case the representative chars of the
+       script is a vector.
+
+       * character.c (syms_of_character): Docstring of
+       script-representative-chars fixed.
+
 2008-08-31  Eli Zaretskii  <address@hidden>
 
        * msdos.c (BUILD_CHAR_GLYPH): New macro.
@@ -47,6 +57,7 @@
 
        * w32uniscribe.c (uniscribe_check_otf): Don't fallback on DFLT script.
 
+>>>>>>> 1.6936
 2008-08-29  Eli Zaretskii  <address@hidden>
 
        * composite.c (fill_gstring_body): Avoid compiler warnings.