Mercurial > hg > xemacs-beta

comparison src/chartab.c @ 5445:6506fcb40fcf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with trunk.
author Mats Lidell <matsl@xemacs.org>
date Fri, 31 Dec 2010 00:27:29 +0100
parents 8d29f1c4bb98 31be2a3d121d
children 58b38d5b32d0
comparison
equal deleted inserted replaced
5444:388762703a21 5445:6506fcb40fcf
38 38
39 #include "buffer.h" 39 #include "buffer.h"
40 #include "chartab.h" 40 #include "chartab.h"
41 #include "syntax.h" 41 #include "syntax.h"
42 42
43 Lisp_Object Qchar_tablep, Qchar_table, Q_default; 43 Lisp_Object Qchar_tablep, Qchar_table;
44 44
45 Lisp_Object Vall_syntax_tables; 45 Lisp_Object Vall_syntax_tables;
46 46
47 #ifdef MULE 47 #ifdef MULE
48 Lisp_Object Qcategory_table_p; 48 Lisp_Object Qcategory_table_p;
1577 } 1577 }
1578 else if (EQ (key, Q_type)) 1578 else if (EQ (key, Q_type))
1579 { 1579 {
1580 type = value; 1580 type = value;
1581 } 1581 }
1582 else if (EQ (key, Q_default)) 1582 else if (EQ (key, Q_default_))
1583 { 1583 {
1584 default_ = value; 1584 default_ = value;
1585 } 1585 }
1586 else if (!KEYWORDP (key)) 1586 else if (!KEYWORDP (key))
1587 { 1587 {
1622 if (!UNBOUNDP (default_)) 1622 if (!UNBOUNDP (default_))
1623 { 1623 {
1624 check_valid_char_table_value (default_, XCHAR_TABLE_TYPE (chartab), 1624 check_valid_char_table_value (default_, XCHAR_TABLE_TYPE (chartab),
1625 ERROR_ME); 1625 ERROR_ME);
1626 set_char_table_default (chartab, default_); 1626 set_char_table_default (chartab, default_);
1627 set_char_table_default (XCHAR_TABLE (chartab)->mirror_table, default_); 1627 if (!NILP (XCHAR_TABLE (chartab)->mirror_table))
1628 {
1629 set_char_table_default (XCHAR_TABLE (chartab)->mirror_table,
1630 default_);
1631 }
1628 } 1632 }
1629 1633
1630 while (!NILP (dataval)) 1634 while (!NILP (dataval))
1631 { 1635 {
1632 Lisp_Object range = Fcar (dataval); 1636 Lisp_Object range = Fcar (dataval);
1898 DEFSYMBOL (Qcategory_table_value_p); 1902 DEFSYMBOL (Qcategory_table_value_p);
1899 #endif /* MULE */ 1903 #endif /* MULE */
1900 1904
1901 DEFSYMBOL (Qchar_table); 1905 DEFSYMBOL (Qchar_table);
1902 DEFSYMBOL_MULTIWORD_PREDICATE (Qchar_tablep); 1906 DEFSYMBOL_MULTIWORD_PREDICATE (Qchar_tablep);
1903 DEFKEYWORD (Q_default);
1904 1907
1905 DEFSUBR (Fchar_table_p); 1908 DEFSUBR (Fchar_table_p);
1906 DEFSUBR (Fchar_table_type_list); 1909 DEFSUBR (Fchar_table_type_list);
1907 DEFSUBR (Fvalid_char_table_type_p); 1910 DEFSUBR (Fvalid_char_table_type_p);
1908 DEFSUBR (Fchar_table_type); 1911 DEFSUBR (Fchar_table_type);
1953 define_structure_type_keyword (st, Qdata, chartab_data_validate); 1956 define_structure_type_keyword (st, Qdata, chartab_data_validate);
1954 #endif /* NEED_TO_HANDLE_21_4_CODE */ 1957 #endif /* NEED_TO_HANDLE_21_4_CODE */
1955 1958
1956 define_structure_type_keyword (st, Q_type, chartab_type_validate); 1959 define_structure_type_keyword (st, Q_type, chartab_type_validate);
1957 define_structure_type_keyword (st, Q_data, chartab_data_validate); 1960 define_structure_type_keyword (st, Q_data, chartab_data_validate);
1958 define_structure_type_keyword (st, Q_default, chartab_default_validate); 1961 define_structure_type_keyword (st, Q_default_, chartab_default_validate);
1959 } 1962 }
1960 1963
1961 void 1964 void
1962 complex_vars_of_chartab (void) 1965 complex_vars_of_chartab (void)
1963 { 1966 {