*** empty log message ***

diff --git a/src/ChangeLog.22 b/src/ChangeLog.22
index 5046ef0..bed5145 100644 (file)
--- a/src/ChangeLog.22
+++ b/src/ChangeLog.22
@@ -1,3 +1,8 @@
+2003-09-30  Kenichi Handa  <handa@m17n.org>
+
+       * character.c (char_string): Use ASCII_CHAR_P instead of
+       SINGLE_BYTE_CHAR_P.
+
 2003-09-30  Kenichi Handa  <handa@m17n.org>
 
        * xdisp.c (handle_auto_composed_prop): Check if the last
@@ -63,6 +68,7 @@
        * window.c (Fdisplay_buffer, Fframe_selected_window): Remove
        unsued vars.
 
+>>>>>>> 1.1.2.8
 2003-09-26  Dave Love  <fx@gnu.org>
 
        * xterm.c (x_bitmap_mask): Declare.