diff options
| author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 1997-09-29 01:38:57 +0000 |
|---|---|---|
| committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 1997-09-29 01:38:57 +0000 |
| commit | d1005e3cbb37234e61f7b4a35f8271b4b4f01b81 (patch) | |
| tree | 45a799001907d2c11e57e7f332ecc33a29647b99 | |
| parent | 2f110c3ce33c303d5c563faeba748fd2069d2e0a (diff) | |
| download | guile-d1005e3cbb37234e61f7b4a35f8271b4b4f01b81.tar.gz | |
* slib.scm (slib:load): slib:load first tries to load the file
named NAME, then NAME.scm. On error, report the error occuring at
the first attempt (NAME) rather than the second (NAME.scm).
| -rw-r--r-- | ice-9/ChangeLog | 4 | ||||
| -rw-r--r-- | ice-9/slib.scm | 25 |
2 files changed, 16 insertions, 13 deletions
diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog index 5dd4f81c8..97f2fc223 100644 --- a/ice-9/ChangeLog +++ b/ice-9/ChangeLog @@ -1,5 +1,9 @@ Mon Sep 29 03:21:24 1997 Mikael Djurfeldt <mdj@mdj.nada.kth.se> + * slib.scm (slib:load): slib:load first tries to load the file + named NAME, then NAME.scm. On error, report the error occuring at + the first attempt (NAME) rather than the second (NAME.scm). + * boot-9.scm: Bugfix: Hard-solder the print-option procedure into the make-options macro so that we needn't refer to a global symbol. diff --git a/ice-9/slib.scm b/ice-9/slib.scm index ad4c9bd73..63dd2623e 100644 --- a/ice-9/slib.scm +++ b/ice-9/slib.scm @@ -121,19 +121,18 @@ (save-module-excursion (lambda () (set-current-module slib-module) - (let* ((errinfo (catch 'system-error - (lambda () - (load-from-path name) - #f) - (lambda args args))) - (errinfo (and errinfo - (catch 'system-error - (lambda () - (load-from-path - (string-append name ".scm")) - #f) - (lambda args args))))) - (if errinfo + (let ((errinfo (catch 'system-error + (lambda () + (load-from-path name) + #f) + (lambda args args)))) + (if (and errinfo + (catch 'system-error + (lambda () + (load-from-path + (string-append name ".scm")) + #f) + (lambda args args))) (apply throw errinfo)))))) (define slib:load-source slib:load) |