comparison src/chartab.c @ 321:19dcec799385 r21-0-58

Import from CVS: tag r21-0-58
author cvs
date Mon, 13 Aug 2007 10:46:44 +0200
parents c5d627a313b1
children 7c94d56991e1
comparison
equal deleted inserted replaced
320:73c75c43c1f2 321:19dcec799385
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;
555 case CHAR_TABLE_TYPE_DISPLAY: 557 case CHAR_TABLE_TYPE_DISPLAY:
556 case CHAR_TABLE_TYPE_GENERIC: 558 case CHAR_TABLE_TYPE_GENERIC:
557 #ifdef MULE 559 #ifdef MULE
558 case CHAR_TABLE_TYPE_CATEGORY: 560 case CHAR_TABLE_TYPE_CATEGORY:
561 #endif /* MULE */
559 fill_char_table (ct, Qnil); 562 fill_char_table (ct, Qnil);
560 break; 563 break;
561 #endif /* MULE */
562 564
563 case CHAR_TABLE_TYPE_SYNTAX: 565 case CHAR_TABLE_TYPE_SYNTAX:
564 fill_char_table (ct, make_int (Sinherit)); 566 fill_char_table (ct, make_int (Sinherit));
565 break; 567 break;
566 568
773 return val; 775 return val;
774 } 776 }
775 777
776 #endif /* MULE */ 778 #endif /* MULE */
777 779
778 static Lisp_Object 780 Lisp_Object
779 get_char_table (Emchar ch, struct Lisp_Char_Table *ct) 781 get_char_table (Emchar ch, struct Lisp_Char_Table *ct)
780 { 782 {
781 #ifdef MULE 783 #ifdef MULE
782 { 784 {
783 Lisp_Object charset; 785 Lisp_Object charset;
985 Lisp_Object car = XCAR (value); 987 Lisp_Object car = XCAR (value);
986 Lisp_Object cdr = XCDR (value); 988 Lisp_Object cdr = XCDR (value);
987 CHECK_CHAR_COERCE_INT (cdr); 989 CHECK_CHAR_COERCE_INT (cdr);
988 return Fcons (car, cdr); 990 return Fcons (car, cdr);
989 } 991 }
992 break;
993 case CHAR_TABLE_TYPE_CHAR:
994 CHECK_CHAR_COERCE_INT (value);
995 break;
990 default: 996 default:
991 break; 997 break;
992 } 998 }
993 return value; 999 return value;
994 } 1000 }