comparison src/chartab.c @ 371:cc15677e0335 r21-2b1

Import from CVS: tag r21-2b1
author cvs
date Mon, 13 Aug 2007 11:03:08 +0200
parents 7c94d56991e1
children d883f39b8495
comparison
equal deleted inserted replaced
370:bd866891f083 371:cc15677e0335
550 ct = XCHAR_TABLE (table); 550 ct = XCHAR_TABLE (table);
551 551
552 switch (ct->type) 552 switch (ct->type)
553 { 553 {
554 case CHAR_TABLE_TYPE_CHAR: 554 case CHAR_TABLE_TYPE_CHAR:
555 fill_char_table (ct, make_char (0));
556 break;
557 case CHAR_TABLE_TYPE_DISPLAY: 555 case CHAR_TABLE_TYPE_DISPLAY:
558 case CHAR_TABLE_TYPE_GENERIC: 556 case CHAR_TABLE_TYPE_GENERIC:
559 #ifdef MULE 557 #ifdef MULE
560 case CHAR_TABLE_TYPE_CATEGORY: 558 case CHAR_TABLE_TYPE_CATEGORY:
561 #endif /* MULE */
562 fill_char_table (ct, Qnil); 559 fill_char_table (ct, Qnil);
563 break; 560 break;
561 #endif /* MULE */
564 562
565 case CHAR_TABLE_TYPE_SYNTAX: 563 case CHAR_TABLE_TYPE_SYNTAX:
566 fill_char_table (ct, make_int (Sinherit)); 564 fill_char_table (ct, make_int (Sinherit));
567 break; 565 break;
568 566
775 return val; 773 return val;
776 } 774 }
777 775
778 #endif /* MULE */ 776 #endif /* MULE */
779 777
780 Lisp_Object 778 static Lisp_Object
781 get_char_table (Emchar ch, struct Lisp_Char_Table *ct) 779 get_char_table (Emchar ch, struct Lisp_Char_Table *ct)
782 { 780 {
783 #ifdef MULE 781 #ifdef MULE
784 { 782 {
785 Lisp_Object charset; 783 Lisp_Object charset;
987 Lisp_Object car = XCAR (value); 985 Lisp_Object car = XCAR (value);
988 Lisp_Object cdr = XCDR (value); 986 Lisp_Object cdr = XCDR (value);
989 CHECK_CHAR_COERCE_INT (cdr); 987 CHECK_CHAR_COERCE_INT (cdr);
990 return Fcons (car, cdr); 988 return Fcons (car, cdr);
991 } 989 }
992 break;
993 case CHAR_TABLE_TYPE_CHAR:
994 CHECK_CHAR_COERCE_INT (value);
995 break;
996 default: 990 default:
997 break; 991 break;
998 } 992 }
999 return value; 993 return value;
1000 } 994 }
1751 DEFSUBR (Fchar_in_category_p); 1745 DEFSUBR (Fchar_in_category_p);
1752 DEFSUBR (Fcategory_designator_p); 1746 DEFSUBR (Fcategory_designator_p);
1753 DEFSUBR (Fcategory_table_value_p); 1747 DEFSUBR (Fcategory_table_value_p);
1754 #endif /* MULE */ 1748 #endif /* MULE */
1755 1749
1756 }
1757
1758 void
1759 vars_of_chartab (void)
1760 {
1761 /* DO NOT staticpro this. It works just like Vweak_hash_tables. */ 1750 /* DO NOT staticpro this. It works just like Vweak_hash_tables. */
1762 Vall_syntax_tables = Qnil; 1751 Vall_syntax_tables = Qnil;
1763 } 1752 }
1764 1753
1765 void 1754 void