Minor scheme fixes.

* scheme/dry-run.scm: Mention a bug in Guile 2.0.9 that causes
%load-hook to be called twice.
* scheme/idest/list-modules.scm: Improve error handling.
* tests/script05.at: Remove the "loading" diagnostics from the
output.
* tests/script08.at: Likewise.

1 files changed, 27 insertions, 15 deletions

diff --git a/scheme/idest/list-modules.scm b/scheme/idest/list-modules.scm
index 880dbf8..facc54b 100644
--- a/scheme/idest/list-modules.scm
+++ b/scheme/idest/list-modules.scm
@@ -99,27 +99,39 @@
       (set! %load-hook #f)
       (for-each
        (lambda (candidate)
-	 (catch 'misc-error
+	 (catch #t
 		(lambda ()
 		  (let ((mod (resolve-module
 			      (list 'idest type
 				    (string->symbol (car candidate))))))
 		    ; Check if it defines idest-main
-		    (module-ref mod 'idest-main)
-		    ; Print module name
-		    (display (car candidate))
-		    ; Its directory, if required
-		    (if print-dir
-			(format #t " (~A)" (cdr candidate)))
-		    ; A colon, and description (if any)
-		    (format #t ": ~A~%"
-			    (catch #t
-				   (lambda ()
-				     (module-ref mod 'description))
-				   (lambda (key . args)
-				     "no description")))))
+		    (catch #t
+			   (lambda ()
+			     (module-ref mod 'idest-main)
+ 		             ; Print module name
+			     (display (car candidate))
+			     ; Its directory, if required
+			     (if print-dir
+				 (format #t " (~A)" (cdr candidate)))
+			     ; A colon, and description (if any)
+			     (format #t ": ~A~%"
+				     (catch #t
+					    (lambda ()
+					      (module-ref mod 'description))
+					    (lambda (key . args)
+					      "no description"))))
+			(lambda (key . args)
+			  #f))))
+		    
 		(lambda (key . args)
-		  #f)))
+		  (with-output-to-port
+		      (current-error-port)
+		    (lambda ()
+		      (format #t "~A: " progname)
+                      (apply format #t (list-ref args 1) (list-ref args 2))
+                      (format #t ", while loading ~A/~A.scm" (cdr candidate)
+			      (car candidate))
+                      (newline))))))
        candidates)
       (newline)
       (set! %load-hook saved-load-hook))))