Sync up with r21-2-19-tomo-6.

diff --git a/src/ChangeLog b/src/ChangeLog
index 34580c6..6b4c960 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,15 @@
 1999-08-27  MORIOKA Tomohiko  <tomo@etl.go.jp>
 
+       * mule-charset.c: Move setting for `leading-code-private-11' from
+       `syms_of_mule_charset' to `vars_of_mule_charset'.
+
+1999-08-27  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * mule-charset.h (CHARSET_BY_LEADING_BYTE): Use `MIN_LEADING_BYTE'
+       and `NUM_LEADING_BYTES' in assert.
+
+1999-08-27  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
        * character.h (charset_by_leading_byte): Use `NUM_LEADING_BYTES'
        instead of 128.
        (CHARSET_BY_LEADING_BYTE): Use `MIN_LEADING_BYTE' and

diff --git a/src/mule-charset.c b/src/mule-charset.c
index c3e12f0..7959a90 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -1409,12 +1409,6 @@ syms_of_mule_charset (void)
 Version number of UTF-2000.
 */ );
 #endif
-
-  leading_code_private_11 = PRE_LEADING_BYTE_PRIVATE_1;
-  DEFVAR_INT ("leading-code-private-11", &leading_code_private_11 /*
-Leading-code of private TYPE9N charset of column-width 1.
-*/ );
-  leading_code_private_11 = PRE_LEADING_BYTE_PRIVATE_1;
 }
 
 void
@@ -1434,6 +1428,12 @@ vars_of_mule_charset (void)
 
   next_allocated_1_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_1;
   next_allocated_2_byte_leading_byte = MIN_LEADING_BYTE_PRIVATE_2;
+
+  leading_code_private_11 = PRE_LEADING_BYTE_PRIVATE_1;
+  DEFVAR_INT ("leading-code-private-11", &leading_code_private_11 /*
+Leading-code of private TYPE9N charset of column-width 1.
+*/ );
+  leading_code_private_11 = PRE_LEADING_BYTE_PRIVATE_1;
 }
 
 void

diff --git a/src/mule-charset.h b/src/mule-charset.h
index 7686f57..d149930 100644 (file)
--- a/src/mule-charset.h
+++ b/src/mule-charset.h
@@ -565,7 +565,8 @@ INLINE Lisp_Object CHARSET_BY_LEADING_BYTE (int lb);
 INLINE Lisp_Object
 CHARSET_BY_LEADING_BYTE (int lb)
 {
-  assert (lb >= 0x80 && lb <= 0xFF);
+  assert (lb >= MIN_LEADING_BYTE &&
+         lb < (MIN_LEADING_BYTE + NUM_LEADING_BYTES));
   return charset_by_leading_byte[lb - MIN_LEADING_BYTE];
 }