diff options
author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 1999-08-29 14:21:30 +0000 |
---|---|---|
committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 1999-08-29 14:21:30 +0000 |
commit | defed51763cf7bd55333ef76c2db41ec049a09ff (patch) | |
tree | 4f02eef99507b2c05d41ac0ca9d6f7c875258b38 | |
parent | c5b738b5004030263de68e043ff31c81bdedf2ea (diff) | |
download | guile-defed51763cf7bd55333ef76c2db41ec049a09ff.tar.gz |
* boot-9.scm (try-module-autoload): Use %search-load-path.
-rw-r--r-- | ice-9/boot-9.scm | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm index 198862ad4..9b92a5a60 100644 --- a/ice-9/boot-9.scm +++ b/ice-9/boot-9.scm @@ -2010,32 +2010,12 @@ (let ((didit #f)) (dynamic-wind (lambda () (autoload-in-progress! dir-hint name)) - (lambda () - (let loop ((dirs %load-path)) - (and (not (null? dirs)) - (or - (let ((d (car dirs)) - (trys (list - dir-hint - (sfx dir-hint) - (in-vicinity dir-hint name) - (in-vicinity dir-hint (sfx name))))) - (and (or-map (lambda (f) - (let ((full (in-vicinity d f))) - full - (and (file-exists? full) - (not (file-is-directory? full)) - (begin - (save-module-excursion - (lambda () - (load (string-append - d "/" f)))) - #t)))) - trys) - (begin - (set! didit #t) - #t))) - (loop (cdr dirs)))))) + (lambda () + (let ((full (%search-load-path (in-vicinity dir-hint name)))) + (if full + (begin + (save-module-excursion (lambda () (primitive-load full))) + (set! didit #t))))) (lambda () (set-autoloaded! dir-hint name didit))) didit)))) |