Mercurial > emacs
changeset 17185:0d5a1bae9d73
(MAX_CHARSET): Definition changed to the actual
maximum valid charset.
(MAX_CHAR): New macro.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Tue, 18 Mar 1997 23:31:34 +0000 |
| parents | caab9110ee07 |
| children | 65bc06706714 |
| files | src/charset.h |
| diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/charset.h Tue Mar 18 23:31:34 1997 +0000 +++ b/src/charset.h Tue Mar 18 23:31:34 1997 +0000 @@ -118,6 +118,9 @@ #define MIN_CHARSET_PRIVATE_DIMENSION1 LEADING_CODE_EXT_11 #define MIN_CHARSET_PRIVATE_DIMENSION2 LEADING_CODE_EXT_21 +/* Maximum value of overall charset identification number. */ +#define MAX_CHARSET 0xFE + /* Definition of special charsets. */ #define CHARSET_ASCII 0 #define CHARSET_COMPOSITION 0x80 @@ -370,11 +373,11 @@ #define CHARSET_VALID_P(charset) \ ((charset) == 0 \ || ((charset) >= 0x80 && (charset) <= MAX_CHARSET_OFFICIAL_DIMENSION2) \ - || ((charset) >= MIN_CHARSET_PRIVATE_DIMENSION1 && (charset) < MAX_CHARSET)) + || ((charset) >= MIN_CHARSET_PRIVATE_DIMENSION1 && (charset) <= MAX_CHARSET)) /* 1 if CHARSET is already defined, else 0. */ #define CHARSET_DEFINED_P(charset) \ - (((charset) >= 0) && ((charset) < MAX_CHARSET) \ + (((charset) >= 0) && ((charset) <= MAX_CHARSET) \ && !NILP (CHARSET_TABLE_ENTRY (charset))) /* Since the information CHARSET-BYTES and CHARSET-WIDTH of @@ -494,8 +497,6 @@ ? c1 = *(str), charset = CHARSET_ASCII \ : charset) -#define MAX_CHARSET 0xFF - /* Mapping table from ISO2022's charset (specified by DIMENSION, CHARS, and FINAL_CHAR) to Emacs' charset. Should be accessed by macro ISO_CHARSET_TABLE (DIMENSION, CHARS, FINAL_CHAR). */ @@ -650,5 +651,7 @@ /* This is the maximum length of multi-byte form. */ #define MAX_LENGTH_OF_MULTI_BYTE_FORM (MAX_COMPONENT_COUNT * 6) +/* Maximum character code currently used. */ +#define MAX_CHAR (MIN_CHAR_COMPOSITION + n_cmpchars) + #endif /* _CHARSET_H */ -