Mercurial > hg > xemacs-beta
diff src/chartab.c @ 5445:6506fcb40fcf
Merged with trunk.
| author | Mats Lidell <matsl@xemacs.org> |
|---|---|
| date | Fri, 31 Dec 2010 00:27:29 +0100 |
| parents | 8d29f1c4bb98 31be2a3d121d |
| children | 58b38d5b32d0 |
line wrap: on
line diff
--- a/src/chartab.c Sun Dec 26 01:48:40 2010 +0100 +++ b/src/chartab.c Fri Dec 31 00:27:29 2010 +0100 @@ -40,7 +40,7 @@ #include "chartab.h" #include "syntax.h" -Lisp_Object Qchar_tablep, Qchar_table, Q_default; +Lisp_Object Qchar_tablep, Qchar_table; Lisp_Object Vall_syntax_tables; @@ -1579,7 +1579,7 @@ { type = value; } - else if (EQ (key, Q_default)) + else if (EQ (key, Q_default_)) { default_ = value; } @@ -1624,7 +1624,11 @@ check_valid_char_table_value (default_, XCHAR_TABLE_TYPE (chartab), ERROR_ME); set_char_table_default (chartab, default_); - set_char_table_default (XCHAR_TABLE (chartab)->mirror_table, default_); + if (!NILP (XCHAR_TABLE (chartab)->mirror_table)) + { + set_char_table_default (XCHAR_TABLE (chartab)->mirror_table, + default_); + } } while (!NILP (dataval)) @@ -1900,7 +1904,6 @@ DEFSYMBOL (Qchar_table); DEFSYMBOL_MULTIWORD_PREDICATE (Qchar_tablep); - DEFKEYWORD (Q_default); DEFSUBR (Fchar_table_p); DEFSUBR (Fchar_table_type_list); @@ -1955,7 +1958,7 @@ define_structure_type_keyword (st, Q_type, chartab_type_validate); define_structure_type_keyword (st, Q_data, chartab_data_validate); - define_structure_type_keyword (st, Q_default, chartab_default_validate); + define_structure_type_keyword (st, Q_default_, chartab_default_validate); } void