comparison src/character.c @ 88913:76074dea1258

(Vscript_alist): This variable deleted. (Vchar_script_table, Qchar_script_table): New variable. (syms_of_character): Declare Vchar_script_table as a lisp variable and initialize it.
author Kenichi Handa <handa@m17n.org>
date Fri, 26 Jul 2002 06:19:03 +0000
parents a0ae1a5876c7
children f026b7e4fc61
comparison
equal deleted inserted replaced
88912:8392c10256e6 88913:76074dea1258
75 75
76 /* Variables used locally in the macro FETCH_MULTIBYTE_CHAR. */ 76 /* Variables used locally in the macro FETCH_MULTIBYTE_CHAR. */
77 unsigned char *_fetch_multibyte_char_p; 77 unsigned char *_fetch_multibyte_char_p;
78 int _fetch_multibyte_char_len; 78 int _fetch_multibyte_char_len;
79 79
80 /* Alist of scripts vs character ranges. */ 80 /* Char table of scripts. */
81 Lisp_Object Vscript_alist; 81 Lisp_Object Vchar_script_table;
82
83 static Lisp_Object Qchar_script_table;
84
82 85
83 86
84 87
85 int 88 int
86 char_string_with_unification (c, p) 89 char_string_with_unification (c, p)
918 921
919 DEFVAR_LISP ("printable-chars", &Vprintable_chars, 922 DEFVAR_LISP ("printable-chars", &Vprintable_chars,
920 doc: /* A char-table for each printable character. */); 923 doc: /* A char-table for each printable character. */);
921 Vprintable_chars = Fmake_char_table (Qnil, Qnil); 924 Vprintable_chars = Fmake_char_table (Qnil, Qnil);
922 925
923 DEFVAR_LISP ("script-alist", &Vscript_alist, 926 DEFVAR_LISP ("char-script-table", &Vchar_script_table,
924 doc: /* Alist of scripts vs the corresponding character ranges. 927 doc: /* Char table of script symbols.
925 Each element has this form: 928 It has one extra slot whose value is a list of script symbols. */);
926 ( SCRIPT (FROM-1 . TO-1) (FROM-2 . TO-2) ...) 929
927 SCRIPT is a symbol representing a script name. 930 /* Intern this now in case it isn't already done.
928 FROM-n and TO-n specifies ranges of characters that belongs to SCRIPT. */); 931 Setting this variable twice is harmless.
929 Vscript_alist = Qnil; 932 But don't staticpro it here--that is done in alloc.c. */
933 Qchar_table_extra_slots = intern ("char-table-extra-slots");
934 DEFSYM (Qchar_script_table, "char-script-table");
935 Fput (Qchar_script_table, Qchar_table_extra_slots, make_number (1));
936 Vchar_script_table = Fmake_char_table (Qchar_script_table, Qnil);
930 } 937 }
931 938
932 #endif /* emacs */ 939 #endif /* emacs */