comparison src/mule-charset.c @ 4833:4dd2389173fc

merge
author Ben Wing <ben@xemacs.org>
date Sun, 10 Jan 2010 01:06:15 -0600
parents c12b646d84ee 6f84332672fb
children a98ca4640147
comparison
equal deleted inserted replaced
4832:07fa38c30fdf 4833:4dd2389173fc
45 Lisp_Object Vcharset_latin_iso8859_2; 45 Lisp_Object Vcharset_latin_iso8859_2;
46 Lisp_Object Vcharset_latin_iso8859_3; 46 Lisp_Object Vcharset_latin_iso8859_3;
47 Lisp_Object Vcharset_latin_iso8859_4; 47 Lisp_Object Vcharset_latin_iso8859_4;
48 Lisp_Object Vcharset_thai_tis620; 48 Lisp_Object Vcharset_thai_tis620;
49 Lisp_Object Vcharset_greek_iso8859_7; 49 Lisp_Object Vcharset_greek_iso8859_7;
50 Lisp_Object Vcharset_arabic_iso8859_6;
50 Lisp_Object Vcharset_hebrew_iso8859_8; 51 Lisp_Object Vcharset_hebrew_iso8859_8;
51 Lisp_Object Vcharset_katakana_jisx0201; 52 Lisp_Object Vcharset_katakana_jisx0201;
52 Lisp_Object Vcharset_latin_jisx0201; 53 Lisp_Object Vcharset_latin_jisx0201;
53 Lisp_Object Vcharset_cyrillic_iso8859_5; 54 Lisp_Object Vcharset_cyrillic_iso8859_5;
54 Lisp_Object Vcharset_latin_iso8859_9; 55 Lisp_Object Vcharset_latin_iso8859_9;
91 Qlatin_iso8859_2, 92 Qlatin_iso8859_2,
92 Qlatin_iso8859_3, 93 Qlatin_iso8859_3,
93 Qlatin_iso8859_4, 94 Qlatin_iso8859_4,
94 Qthai_tis620, 95 Qthai_tis620,
95 Qgreek_iso8859_7, 96 Qgreek_iso8859_7,
97 Qarabic_iso8859_6,
96 Qhebrew_iso8859_8, 98 Qhebrew_iso8859_8,
97 Qkatakana_jisx0201, 99 Qkatakana_jisx0201,
98 Qlatin_jisx0201, 100 Qlatin_jisx0201,
99 Qcyrillic_iso8859_5, 101 Qcyrillic_iso8859_5,
100 Qlatin_iso8859_9, 102 Qlatin_iso8859_9,
623 if (temporary) 625 if (temporary)
624 { 626 {
625 Ibyte tempname[80]; 627 Ibyte tempname[80];
626 628
627 qxesprintf (tempname, "___temporary___%d__", id); 629 qxesprintf (tempname, "___temporary___%d__", id);
628 name = intern_int (tempname); 630 name = Fmake_symbol (build_intstring (tempname)); /* Uninterned. */
629 } 631 }
630 if (NILP (doc_string)) 632 if (NILP (doc_string))
631 doc_string = build_string (""); 633 doc_string = build_string ("");
632 if (NILP (registries)) 634 if (NILP (registries))
633 registries = make_vector(0, Qnil); 635 registries = make_vector(0, Qnil);
1101 DEFSYMBOL (Qlatin_iso8859_2); 1103 DEFSYMBOL (Qlatin_iso8859_2);
1102 DEFSYMBOL (Qlatin_iso8859_3); 1104 DEFSYMBOL (Qlatin_iso8859_3);
1103 DEFSYMBOL (Qlatin_iso8859_4); 1105 DEFSYMBOL (Qlatin_iso8859_4);
1104 DEFSYMBOL (Qthai_tis620); 1106 DEFSYMBOL (Qthai_tis620);
1105 DEFSYMBOL (Qgreek_iso8859_7); 1107 DEFSYMBOL (Qgreek_iso8859_7);
1108 DEFSYMBOL (Qarabic_iso8859_6);
1106 DEFSYMBOL (Qhebrew_iso8859_8); 1109 DEFSYMBOL (Qhebrew_iso8859_8);
1107 DEFSYMBOL (Qkatakana_jisx0201); 1110 DEFSYMBOL (Qkatakana_jisx0201);
1108 DEFSYMBOL (Qlatin_jisx0201); 1111 DEFSYMBOL (Qlatin_jisx0201);
1109 DEFSYMBOL (Qcyrillic_iso8859_5); 1112 DEFSYMBOL (Qcyrillic_iso8859_5);
1110 DEFSYMBOL (Qlatin_iso8859_9); 1113 DEFSYMBOL (Qlatin_iso8859_9);
1224 CHARSET_LEFT_TO_RIGHT, 1227 CHARSET_LEFT_TO_RIGHT,
1225 build_string ("ISO8859-7"), 1228 build_string ("ISO8859-7"),
1226 build_msg_string ("ISO8859-7 (Greek)"), 1229 build_msg_string ("ISO8859-7 (Greek)"),
1227 build_msg_string ("ISO8859-7 (Greek)"), 1230 build_msg_string ("ISO8859-7 (Greek)"),
1228 vector1(build_string("iso8859-7")), 0, 0); 1231 vector1(build_string("iso8859-7")), 0, 0);
1232 staticpro (&Vcharset_arabic_iso8859_6);
1233 Vcharset_arabic_iso8859_6 =
1234 make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 2,
1235 CHARSET_TYPE_96, 1, 1, 'G',
1236 CHARSET_RIGHT_TO_LEFT,
1237 build_string ("ISO8859-6"),
1238 build_msg_string ("ISO8859-6 (Arabic)"),
1239 build_msg_string ("ISO8859-6 (Arabic)"),
1240 vector1(build_string ("iso8859-6")), 0, 0);
1229 staticpro (&Vcharset_hebrew_iso8859_8); 1241 staticpro (&Vcharset_hebrew_iso8859_8);
1230 Vcharset_hebrew_iso8859_8 = 1242 Vcharset_hebrew_iso8859_8 =
1231 make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2, 1243 make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2,
1232 CHARSET_TYPE_96, 1, 1, 'H', 1244 CHARSET_TYPE_96, 1, 1, 'H',
1233 CHARSET_RIGHT_TO_LEFT, 1245 CHARSET_RIGHT_TO_LEFT,