# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1029378608 0
# Node ID cd3317b3e1a9e3f85bf8b64aa2e6593c3b17cf24
# Parent  4e77456fab6ccdd1325cb318163e80738e23e5fa
*** empty log message ***

diff -r 4e77456fab6c -r cd3317b3e1a9 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Aug 15 02:29:16 2002 +0000
+++ b/lisp/ChangeLog	Thu Aug 15 02:30:08 2002 +0000
@@ -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 -r 4e77456fab6c -r cd3317b3e1a9 src/ChangeLog
--- a/src/ChangeLog	Thu Aug 15 02:29:16 2002 +0000
+++ b/src/ChangeLog	Thu Aug 15 02:30:08 2002 +0000
@@ -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 -r 4e77456fab6c -r cd3317b3e1a9 src/chartab.c
--- a/src/chartab.c	Thu Aug 15 02:29:16 2002 +0000
+++ b/src/chartab.c	Thu Aug 15 02:30:08 2002 +0000
@@ -430,7 +430,7 @@
 {
   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
     {