(Vcharset_ordered_list): Extern it.

(charset_ordered_list_tick): Extern it.
(EMACS_MULE_LEADING_CODE_PRIVATE_11,
EMACS_MULE_LEADING_CODE_PRIVATE_12,
EMACS_MULE_LEADING_CODE_PRIVATE_21,
EMACS_MULE_LEADING_CODE_PRIVATE_22): New macros
(Funify_charset): Adjusted for the change of Funify_charset.

diff --git a/src/charset.h b/src/charset.h
index 511ef3458e19180356aee4454025aab0f5251deb..03e8de75e5d84861d5946f7d17da1f753ce33bed 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
@@ -209,7 +209,9 @@ struct charset
 
   /* Mininum and Maximum character codes of the charset.  If the
      charset is compatible with ASCII, min_char is a minimum non-ASCII
-     character of the charset.  */
+     character of the charset.  If the method of charset is
+     CHARSET_METHOD_OFFSET, even if the charset is unified, min_char
+     and max_char doesn't change.  */
   int min_char, max_char;
 
   /* The code returned by ENCODE_CHAR if a character is not encodable
@@ -247,6 +249,11 @@ extern int charset_table_used;
 
 #define CHARSET_FROM_ID(id) (charset_table + (id))
 
+extern Lisp_Object Vcharset_ordered_list;
+
+/* Incremented everytime we change the priority of charsets.  */
+unsigned short charset_ordered_list_tick;
+
 extern Lisp_Object Vcharset_list;
 extern Lisp_Object Viso_2022_charset_list;
 extern Lisp_Object Vemacs_mule_charset_list;
@@ -486,6 +493,18 @@ extern int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL];
              ? ! NILP (CHAR_TABLE_REF (CHARSET_ENCODER (charset), (c))) \
              : encode_char ((charset), (c)) != (charset)->invalid_code))))
 
+\f
+/* Special macros for emacs-mule encoding.  */
+
+/* Leading-code followed by extended leading-code.    DIMENSION/COLUMN */
+#define EMACS_MULE_LEADING_CODE_PRIVATE_11     0x9A /* 1/1 */
+#define EMACS_MULE_LEADING_CODE_PRIVATE_12     0x9B /* 1/2 */
+#define EMACS_MULE_LEADING_CODE_PRIVATE_21     0x9C /* 2/2 */
+#define EMACS_MULE_LEADING_CODE_PRIVATE_22     0x9D /* 2/2 */
+
+extern struct charset *emacs_mule_charset[256];
+
+\f
 
 extern Lisp_Object Qcharsetp;
 
@@ -508,6 +527,6 @@ extern void map_charset_chars P_ ((void (*) (Lisp_Object, Lisp_Object),
                                   Lisp_Object, Lisp_Object,
                                   struct charset *, unsigned, unsigned));
 
-EXFUN (Funify_charset, 2);
+EXFUN (Funify_charset, 3);
 
 #endif /* EMACS_CHARSET_H */