(get_keyelt): Handle an indirect entry with meta char.

[gnu-emacs] / src / charset.h

diff --git a/src/charset.h b/src/charset.h
index c7c4baecdab88d0b4f92df2ebd67e9acf33c1558..d315dd6fa8f9a2bb2d2c636aff5c53a3114f7e79 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
@@ -118,6 +118,9 @@ Boston, MA 02111-1307, USA.  */
 #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
@@ -307,8 +310,9 @@ extern Lisp_Object Vcharset_table;
    We provide these macros for efficiency.  No range check of CHARSET.  */
 
 /* Return entry of CHARSET (lisp integer) in Vcharset_table.  */
-#define CHARSET_TABLE_ENTRY(charset) \
-  XCHAR_TABLE (Vcharset_table)->contents[charset]
+#define CHARSET_TABLE_ENTRY(charset)                                   \
+  XCHAR_TABLE (Vcharset_table)->contents[((charset) == CHARSET_ASCII   \
+                                         ? 0 : (charset) + 128)]
 
 /* Return information INFO-IDX of CHARSET.  */
 #define CHARSET_TABLE_INFO(charset, info_idx) \
@@ -370,11 +374,11 @@ extern Lisp_Object Vcharset_symbol_table;
 #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
@@ -461,12 +465,12 @@ extern int width_by_char_head[256];
 
 /* The charset of non-ASCII character C is set to CHARSET, and the
    position-codes of C are set to C1 and C2.  C2 of DIMENSION1 character
-   is 0.  */
+   is -1.  */
 #define SPLIT_NON_ASCII_CHAR(c, charset, c1, c2)                        \
   ((c) < MIN_CHAR_OFFICIAL_DIMENSION2                                   \
    ? (charset = CHAR_FIELD2 (c) + 0x70,                                         \
       c1 = CHAR_FIELD3 (c),                                             \
-      c2 = 0)                                                           \
+      c2 = -1)                                                          \
    : (charset = ((c) < MIN_CHAR_COMPOSITION                             \
                 ? (CHAR_FIELD1 (c)                                      \
                    + ((c) < MIN_CHAR_PRIVATE_DIMENSION2 ? 0x8F : 0xE0)) \
@@ -476,14 +480,14 @@ extern int width_by_char_head[256];
 
 /* The charset of character C is set to CHARSET, and the
    position-codes of C are set to C1 and C2.  C2 of DIMENSION1 character
-   is 0.  */
+   is -1.  */
 #define SPLIT_CHAR(c, charset, c1, c2)                 \
   (SINGLE_BYTE_CHAR_P (c)                              \
-   ? charset = CHARSET_ASCII, c1 = (c), c2 = 0         \
+   ? charset = CHARSET_ASCII, c1 = (c), c2 = -1                \
    : SPLIT_NON_ASCII_CHAR (c, charset, c1, c2))
 
 /* The charset of the character at STR is set to CHARSET, and the
-   position-codes are set to C1 and C2.  C2 of DIMENSION1 character is 0.
+   position-codes are set to C1 and C2.  C2 of DIMENSION1 character is -1.
    If the character is a composite character, the upper 7-bit and
    lower 7-bit of CMPCHAR-ID are set in C1 and C2 respectively.  No
    range checking.  */
@@ -494,8 +498,6 @@ extern int width_by_char_head[256];
    ? 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 +652,9 @@ extern int n_cmpchars;
 /* This is the maximum length of multi-byte form.  */
 #define MAX_LENGTH_OF_MULTI_BYTE_FORM (MAX_COMPONENT_COUNT * 6)
 
-#endif /* _CHARSET_H */
+/* Maximum character code currently used.  */
+#define MAX_CHAR (MIN_CHAR_COMPOSITION + n_cmpchars)
 
+extern int unify_char ();
+
+#endif /* _CHARSET_H */