# HG changeset patch # User Kenichi Handa # Date 1027319810 0 # Node ID 1a232a6d79fcaa6e3c0ba5a5e161720a4355e930 # Parent 82c5e4f67e4aa0c74f0146a223a99ad95a63e235 (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 -r 82c5e4f67e4a -r 1a232a6d79fc src/charset.h --- a/src/charset.h Mon Jul 22 06:35:00 2002 +0000 +++ b/src/charset.h Mon Jul 22 06:36:50 2002 +0000 @@ -209,7 +209,9 @@ /* 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 @@ #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 @@ ? ! NILP (CHAR_TABLE_REF (CHARSET_ENCODER (charset), (c))) \ : encode_char ((charset), (c)) != (charset)->invalid_code)))) + +/* 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]; + + extern Lisp_Object Qcharsetp; @@ -508,6 +527,6 @@ Lisp_Object, Lisp_Object, struct charset *, unsigned, unsigned)); -EXFUN (Funify_charset, 2); +EXFUN (Funify_charset, 3); #endif /* EMACS_CHARSET_H */