*** empty log message ***

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 7f22ad2e485492a1506291ef436e6372a0bd7cbe..0d11d7c0e9e3b413ad2d3b001a41d9c83b54019f 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-01  Kenichi Handa  <handa@m17n.org>
+
+       * nonascii.texi (Coding System Basics): Describe about rondtrip
+       identity of coding systems.
+
 2005-03-29  Chong Yidong  <cyd@stupidchicken.com>
 
        * text.texi (Buffer Contents): Add filter-buffer-substring and

diff --git a/src/ChangeLog b/src/ChangeLog
index 258948bf5d393cedc9281bca09fbe6a77c462a21..517a0a2b479c7a4b7a529e064cc14552b0474ecd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+<<<<<<< ChangeLog
+2005-04-01  Kenichi Handa  <handa@m17n.org>
+
+       * lisp.h (Vascii_upcase_table, Vascii_canon_table,
+       Vascii_eqv_table): Extern them.
+
+       * casetab.c (set_case_table): If standard is nonzero, setup
+       Vascii_upcase_table, Vascii_canon_table, and Vascii_eqv_table.
+
+       * search.c (looking_at_1): Use current_buffer->case_canon_table,
+       not DOWNCASE_TABLE.
+       (string_match_1): Likewise.
+       (fast_c_string_match_ignore_case): Use Vascii_canon_table, not
+       Vascii_downcase_table.
+       (fast_string_match_ignore_case): Likewise.
+       (search_buffer): Fix checking of boyer-moore usability.
+       (boyer_moore): Calculate translate_prev_byte1/2/3 in advance.  No
+       need of tranlating characters in PAT.  Fix calculation of
+       simple_translate.
+
 2005-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * xterm.c [HAVE_XAW3D]: Include ThreeD.h for XtNbeNiceToColormap.