diff options
| author | Juanma Barranquero | 2007-10-14 18:00:05 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-10-14 18:00:05 +0000 |
| commit | 9ac66b454877410de28e8c13b3986d0dc7fa7b26 (patch) | |
| tree | 25581d54bc980762acdbcc90e366cb8b015de09c /src | |
| parent | 1a825e5d29e28d772348a5a1e008743bf8d213f3 (diff) | |
| download | emacs-9ac66b454877410de28e8c13b3986d0dc7fa7b26.tar.gz emacs-9ac66b454877410de28e8c13b3986d0dc7fa7b26.zip | |
(do_autoload): Don't save autoloads.
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/eval.c b/src/eval.c index ef789ef9454..3ffacf7d196 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -466,7 +466,7 @@ usage: (prog1 FIRST BODY...) */) | |||
| 466 | struct gcpro gcpro1, gcpro2; | 466 | struct gcpro gcpro1, gcpro2; |
| 467 | register int argnum = 0; | 467 | register int argnum = 0; |
| 468 | 468 | ||
| 469 | if (NILP(args)) | 469 | if (NILP (args)) |
| 470 | return Qnil; | 470 | return Qnil; |
| 471 | 471 | ||
| 472 | args_left = args; | 472 | args_left = args; |
| @@ -2146,7 +2146,7 @@ do_autoload (fundef, funname) | |||
| 2146 | Lisp_Object fundef, funname; | 2146 | Lisp_Object fundef, funname; |
| 2147 | { | 2147 | { |
| 2148 | int count = SPECPDL_INDEX (); | 2148 | int count = SPECPDL_INDEX (); |
| 2149 | Lisp_Object fun, queue, first, second; | 2149 | Lisp_Object fun; |
| 2150 | struct gcpro gcpro1, gcpro2, gcpro3; | 2150 | struct gcpro gcpro1, gcpro2, gcpro3; |
| 2151 | 2151 | ||
| 2152 | /* This is to make sure that loadup.el gives a clear picture | 2152 | /* This is to make sure that loadup.el gives a clear picture |
| @@ -2167,20 +2167,6 @@ do_autoload (fundef, funname) | |||
| 2167 | Vautoload_queue = Qt; | 2167 | Vautoload_queue = Qt; |
| 2168 | Fload (Fcar (Fcdr (fundef)), Qnil, noninteractive ? Qt : Qnil, Qnil, Qt); | 2168 | Fload (Fcar (Fcdr (fundef)), Qnil, noninteractive ? Qt : Qnil, Qnil, Qt); |
| 2169 | 2169 | ||
| 2170 | /* Save the old autoloads, in case we ever do an unload. */ | ||
| 2171 | queue = Vautoload_queue; | ||
| 2172 | while (CONSP (queue)) | ||
| 2173 | { | ||
| 2174 | first = XCAR (queue); | ||
| 2175 | second = Fcdr (first); | ||
| 2176 | first = Fcar (first); | ||
| 2177 | |||
| 2178 | if (SYMBOLP (first) && CONSP (second) && EQ (XCAR (second), Qautoload)) | ||
| 2179 | Fput (first, Qautoload, (XCDR (second))); | ||
| 2180 | |||
| 2181 | queue = XCDR (queue); | ||
| 2182 | } | ||
| 2183 | |||
| 2184 | /* Once loading finishes, don't undo it. */ | 2170 | /* Once loading finishes, don't undo it. */ |
| 2185 | Vautoload_queue = Qt; | 2171 | Vautoload_queue = Qt; |
| 2186 | unbind_to (count, Qnil); | 2172 | unbind_to (count, Qnil); |