*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72541d26cbf55429613dc1cc11e1e1bfdab3dae6..f02b753dbdb51d3d2d1c200ab6a348c275c2a9d1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2002-08-15  Kenichi Handa  <handa@etl.go.jp>
+
+       * international/mule-cmds.el (reset-language-environment): Don't
+       set nonascii-translation-table and nonascii-insert-offset.  Call
+       set-unibyte-charset, not set-primary-charset.
+       (nonascii-translation-table, nonascii-insert-offset): Declare
+       these variable as obsolete ones.
+       (set-language-environment): Call set-unibyte-charset, not
+       set-primary-charset.  Call set-charset-priority with `charset'
+       info of the language environment.
+
 2002-08-08  Kenichi Handa  <handa@etl.go.jp>
 
        * tar-mode.el (tar-extract): Fix previous change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3cade674624adb3d39b6f92bc0217809657b6c12..8e97ee3bd312ac92ff9376df77c57e010a91f932 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,28 @@
+2002-08-15  Kenichi Handa  <handa@etl.go.jp>
+
+       * fontset.c (fontset_add): Make the type `int'.
+       (fontset_id_valid_p): Define it if FONTSET_DEBUG is defined.
+
+       * character.c (unibyte_char_to_multibyte): Refer to
+       charset_unibyte, not charset_primary.
+       (multibyte_char_to_unibyte): Likewise.
+       (Funibyte_char_to_multibyte): Likewise.
+
+       * charset.h: (charset_unibyte): Extern it instead of
+       charset_primary.
+
+       * charset.c (charset_unibyte): Renamed from charset_primary.
+       (Funibyte_charset): Renamed from Fprimary_charset.
+       (Fset_unibyte_charset): Renamed from Fset_primary_charset.
+       (syms_of_charset): Adjusted for the above changes.
+
+       * w32term.c (x_produce_glyphs): Use ASCII_CHAR_P, not
+       SINGLE_BYTE_CHAR_P.  Fix the logic of handling non-ASCII char when
+       it->multibyte_p is zero.
+
+       * lisp.h (nonascii_insert_offset, Vnonascii_translation_table):
+       Extern deleted.
+
 2002-08-08  Kenichi Handa  <handa@etl.go.jp>
 
        * coding.c (Fdefine_coding_system_internal): Fix category setting

diff --git a/src/chartab.c b/src/chartab.c
index 3f9a9b8e00c58fbac7fa5246b0c7a6ebe84c2917..919331f787888a13374b34e743bd786f977a4dc0 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -430,7 +430,7 @@ sub_char_table_set_range (table, depth, min_char, from, to, val)
 {
   int max_char = min_char + chartab_chars[depth] - 1;
 
-  if (depth == 3 || from <= min_char && to >= max_char)
+  if (depth == 3 || (from <= min_char && to >= max_char))
     *table = val;
   else
     {