Mercurial > hg > xemacs-beta
comparison src/specifier.c @ 74:54cc21c15cbb r20-0b32
Import from CVS: tag r20-0b32
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:04:33 +0200 |
parents | 131b0175ea99 |
children | 6a378aca36af |
comparison
equal
deleted
inserted
replaced
73:e2d7a37b7c8d | 74:54cc21c15cbb |
---|---|
1046 Lisp_Object opaque = make_opaque_ptr ((void *) | 1046 Lisp_Object opaque = make_opaque_ptr ((void *) |
1047 meths->validate_method); | 1047 meths->validate_method); |
1048 struct gcpro gcpro1; | 1048 struct gcpro gcpro1; |
1049 | 1049 |
1050 GCPRO1 (opaque); | 1050 GCPRO1 (opaque); |
1051 retval = call_with_suspended_errors (call_validate_method, | 1051 retval = call_with_suspended_errors |
1052 Qnil, | 1052 ((lisp_fn_t) call_validate_method, |
1053 Qspecifier, errb, 2, | 1053 Qnil, Qspecifier, errb, 2, opaque, instantiator); |
1054 opaque, instantiator); | 1054 |
1055 free_opaque_ptr (opaque); | 1055 free_opaque_ptr (opaque); |
1056 UNGCPRO; | 1056 UNGCPRO; |
1057 } | 1057 } |
1058 | 1058 |
1059 return retval; | 1059 return retval; |
2149 Lisp_Object opaque = | 2149 Lisp_Object opaque = |
2150 make_opaque_ptr ((void *) meths->validate_matchspec_method); | 2150 make_opaque_ptr ((void *) meths->validate_matchspec_method); |
2151 struct gcpro gcpro1; | 2151 struct gcpro gcpro1; |
2152 | 2152 |
2153 GCPRO1 (opaque); | 2153 GCPRO1 (opaque); |
2154 retval = call_with_suspended_errors (call_validate_matchspec_method, | 2154 retval = call_with_suspended_errors |
2155 Qnil, | 2155 ( (lisp_fn_t) call_validate_matchspec_method, |
2156 Qspecifier, errb, 2, | 2156 Qnil, Qspecifier, errb, 2, opaque, matchspec); |
2157 opaque, matchspec); | 2157 |
2158 free_opaque_ptr (opaque); | 2158 free_opaque_ptr (opaque); |
2159 UNGCPRO; | 2159 UNGCPRO; |
2160 } | 2160 } |
2161 | 2161 |
2162 return retval; | 2162 return retval; |
2273 if (device_matches_specifier_tag_set_p (device, tag_set)) | 2273 if (device_matches_specifier_tag_set_p (device, tag_set)) |
2274 { | 2274 { |
2275 Lisp_Object val = XCDR (tagged_inst); | 2275 Lisp_Object val = XCDR (tagged_inst); |
2276 | 2276 |
2277 if (HAS_SPECMETH_P (sp, instantiate)) | 2277 if (HAS_SPECMETH_P (sp, instantiate)) |
2278 val = call_with_suspended_errors (RAW_SPECMETH (sp, instantiate), | 2278 val = call_with_suspended_errors |
2279 Qunbound, Qspecifier, errb, | 2279 ( (lisp_fn_t) RAW_SPECMETH (sp, instantiate), |
2280 5, specifier, matchspec, domain, | 2280 Qunbound, Qspecifier, errb, 5, specifier, |
2281 XCDR (tagged_inst), | 2281 matchspec, domain, XCDR (tagged_inst), depth); |
2282 depth); | |
2283 | 2282 |
2284 if (!UNBOUNDP (val)) | 2283 if (!UNBOUNDP (val)) |
2285 { | 2284 { |
2286 unbind_to (count, Qnil); | 2285 unbind_to (count, Qnil); |
2287 UNGCPRO; | 2286 UNGCPRO; |