Mercurial > hg > xemacs-beta
comparison src/eval.c @ 5222:18c0b5909d16
Use keywords in structure syntax; new #define, NEED_TO_HANDLE_21_4_CODE 1
src/ChangeLog addition:
2010-05-31 Aidan Kehoe <kehoea@parhasard.net>
* rangetab.c (print_range_table, rangetab_instantiate)
(structure_type_create_rangetab):
* chartab.c (print_char_table, chartab_instantiate)
(structure_type_create_chartab):
* faces.c (syms_of_faces, print_face, face_validate):
Move structure syntax in these files to using keywords by default,
as is done in Common Lisp and GNU Emacs, accepting for the moment
the older non-keywords syntax too.
* glyphs.h: No need to have Q_data here.
* general-slots.h: Add Q_data, Q_type here.
* config.h.in (NEED_TO_HANDLE_21_4_CODE):
New #define, always 1 for the moment, replacing the previous
never-really-used NO_NEED_TO_HANDLE_21_4_CODE, and avoiding
confusing syntax.
* eval.c (Ffuncall): Wrap the hack that allows #'throw to be
funcalled in #ifdef NEED_TO_HANDLE_21_4_CODE.
* elhash.c (syms_of_elhash): Move Q_type, Q_data to
general-slots.h. Change to NEED_TO_HANDLE_21_4_CODE throughout
this file.
lisp/ChangeLog addition:
2010-05-31 Aidan Kehoe <kehoea@parhasard.net>
* specifier.el (current-display-table):
Use keywords in the structure syntax here, now we've moved to that
by default in C.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Mon, 31 May 2010 16:47:44 +0100 |
parents | 1096ef427b56 |
children | 5663ae9a8989 |
comparison
equal
deleted
inserted
replaced
5221:ac6846067766 | 5222:18c0b5909d16 |
---|---|
4115 val = SUBR_FUNCTION (subr, MANY) (fun_nargs, fun_args); | 4115 val = SUBR_FUNCTION (subr, MANY) (fun_nargs, fun_args); |
4116 PROFILE_EXIT_FUNCTION (); | 4116 PROFILE_EXIT_FUNCTION (); |
4117 } | 4117 } |
4118 else if (max_args == UNEVALLED) /* Can't funcall a special operator */ | 4118 else if (max_args == UNEVALLED) /* Can't funcall a special operator */ |
4119 { | 4119 { |
4120 | |
4121 #ifdef NEED_TO_HANDLE_21_4_CODE | |
4120 /* Ugh, ugh, ugh. */ | 4122 /* Ugh, ugh, ugh. */ |
4121 if (EQ (fun, XSYMBOL_FUNCTION (Qthrow))) | 4123 if (EQ (fun, XSYMBOL_FUNCTION (Qthrow))) |
4122 { | 4124 { |
4123 args[0] = Qobsolete_throw; | 4125 args[0] = Qobsolete_throw; |
4124 goto retry; | 4126 goto retry; |
4125 } | 4127 } |
4128 #endif /* NEED_TO_HANDLE_21_4_CODE */ | |
4129 | |
4126 goto invalid_function; | 4130 goto invalid_function; |
4127 } | 4131 } |
4128 else | 4132 else |
4129 { | 4133 { |
4130 wrong_number_of_arguments: | 4134 wrong_number_of_arguments: |