From 8c6f5bf67095394a83049a7c87d1c9e71756519c Mon Sep 17 00:00:00 2001 From: tomo Date: Sat, 14 Dec 2002 17:38:01 +0000 Subject: [PATCH] Sync with r21-2-19-utf-2000-0_4-2. --- src/ChangeLog | 30 ++++++++++++++++++++++++++++++ src/character.h | 5 +++-- src/faces.h | 2 +- src/mule-charset.c | 4 ++-- src/mule-charset.h | 5 +++-- 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0f13e20..e4da5d0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,33 @@ +1999-08-27 MORIOKA Tomohiko + + * 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 + + * mule-charset.h (CHARSET_BY_LEADING_BYTE): Use `MIN_LEADING_BYTE' + and `NUM_LEADING_BYTES' in assert. + +1999-08-27 MORIOKA Tomohiko + + * character.h (charset_by_leading_byte): Use `NUM_LEADING_BYTES' + instead of 128. + (CHARSET_BY_LEADING_BYTE): Use `MIN_LEADING_BYTE' and + `NUM_LEADING_BYTES' instead of 128. + +1999-08-26 MORIOKA Tomohiko + + * mule-charset.h (charset_by_leading_byte): Use + `NUM_LEADING_BYTES' instead of 128. + (CHARSET_BY_LEADING_BYTE): Use `MIN_LEADING_BYTE' instead of 128. + + * mule-charset.c (charset_by_leading_byte): Use + `NUM_LEADING_BYTES' instead of 128. + (make_charset): Use `MIN_LEADING_BYTE' instead of 128. + + * faces.h (FACE_CACHEL_FONT): Use `MIN_LEADING_BYTE' instead of + 128. + 1999-08-25 MORIOKA Tomohiko * mule-charset.c (syms_of_mule_charset): Update to diff --git a/src/character.h b/src/character.h index abdbe03..f35b450 100644 --- a/src/character.h +++ b/src/character.h @@ -276,7 +276,7 @@ DECLARE_LRECORD (charset, Lisp_Charset); struct charset_lookup { /* Table of charsets indexed by leading byte. */ - Lisp_Object charset_by_leading_byte[128]; + Lisp_Object charset_by_leading_byte[NUM_LEADING_BYTES]; /* Table of charsets indexed by type/final-byte/direction. */ Lisp_Object charset_by_attributes[4][128][2]; @@ -294,7 +294,8 @@ CHARSET_BY_LEADING_BYTE (Bufbyte lb) /* When error-checking is on, x86 GCC 2.95.2 -O3 miscompiles the following unless we introduce `tem'. */ int tem = lb; - type_checking_assert (tem >= 0x80 && tem <= 0xFF); + type_checking_assert (tem >= MIN_LEADING_BYTE && + tem <= (MIN_LEADING_BYTE + NUM_LEADING_BYTES)); #endif return chlook->charset_by_leading_byte[lb - 128]; } diff --git a/src/faces.h b/src/faces.h index 1969fe0..a953e54 100644 --- a/src/faces.h +++ b/src/faces.h @@ -279,7 +279,7 @@ void default_face_height_and_width_1 (Lisp_Object domain, int *height, int *width); #define FACE_CACHEL_FONT(cachel, charset) \ - (cachel->font[XCHARSET_LEADING_BYTE (charset) - 128]) + (cachel->font[XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE]) #define WINDOW_FACE_CACHEL(window, index) \ Dynarr_atp ((window)->face_cachels, index) diff --git a/src/mule-charset.c b/src/mule-charset.c index 6b053e8..bc84a0b 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -590,8 +590,8 @@ make_charset (int id, Lisp_Object name, unsigned char rep_bytes, chlook->charset_by_attributes[type][final][direction] = obj; } - assert (NILP (chlook->charset_by_leading_byte[id - 128])); - chlook->charset_by_leading_byte[id - 128] = obj; + assert (NILP (chlook->charset_by_leading_byte[id - MIN_LEADING_BYTE])); + chlook->charset_by_leading_byte[id - MIN_LEADING_BYTE] = obj; /* Some charsets are "faux" and don't have names or really exist at all except in the leading-byte table. */ diff --git a/src/mule-charset.h b/src/mule-charset.h index 46cd3a0..768e328 100644 --- a/src/mule-charset.h +++ b/src/mule-charset.h @@ -552,7 +552,7 @@ DECLARE_LRECORD (charset, Lisp_Charset); struct charset_lookup { /* Table of charsets indexed by leading byte. */ - Lisp_Object charset_by_leading_byte[128]; + Lisp_Object charset_by_leading_byte[NUM_LEADING_BYTES]; /* Table of charsets indexed by type/final-byte/direction. */ Lisp_Object charset_by_attributes[4][128][2]; @@ -570,7 +570,8 @@ CHARSET_BY_LEADING_BYTE (Bufbyte lb) /* When error-checking is on, x86 GCC 2.95.2 -O3 miscompiles the following unless we introduce `tem'. */ int tem = lb; - type_checking_assert (tem >= 0x80 && tem <= 0xFF); + type_checking_assert (tem >= MIN_LEADING_BYTE && + tem <= (MIN_LEADING_BYTE + NUM_LEADING_BYTES)); #endif return chlook->charset_by_leading_byte[lb - 128]; } -- 1.7.10.4