Mercurial > emacs
comparison src/eval.c @ 85688:b210bba3f477
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-908
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 27 Oct 2007 09:07:17 +0000 |
parents | a89507976418 f19edd342e7b |
children | 0ec5ce87b9e0 4bc33ffdda1a |
comparison
equal
deleted
inserted
replaced
85687:666ace46440f | 85688:b210bba3f477 |
---|---|
2192 GCPRO3 (fun, funname, fundef); | 2192 GCPRO3 (fun, funname, fundef); |
2193 | 2193 |
2194 /* Preserve the match data. */ | 2194 /* Preserve the match data. */ |
2195 record_unwind_save_match_data (); | 2195 record_unwind_save_match_data (); |
2196 | 2196 |
2197 /* Value saved here is to be restored into Vautoload_queue. */ | 2197 /* If autoloading gets an error (which includes the error of failing |
2198 to define the function being called), we use Vautoload_queue | |
2199 to undo function definitions and `provide' calls made by | |
2200 the function. We do this in the specific case of autoloading | |
2201 because autoloading is not an explicit request "load this file", | |
2202 but rather a request to "call this function". | |
2203 | |
2204 The value saved here is to be restored into Vautoload_queue. */ | |
2198 record_unwind_protect (un_autoload, Vautoload_queue); | 2205 record_unwind_protect (un_autoload, Vautoload_queue); |
2199 Vautoload_queue = Qt; | 2206 Vautoload_queue = Qt; |
2200 Fload (Fcar (Fcdr (fundef)), Qnil, Qt, Qnil, Qt); | 2207 Fload (Fcar (Fcdr (fundef)), Qnil, Qt, Qnil, Qt); |
2201 | 2208 |
2202 /* Once loading finishes, don't undo it. */ | 2209 /* Once loading finishes, don't undo it. */ |