merge from 1.8 branch

ice-9/ChangeLog

@@ -1,3 +1,15 @@
+2006-05-28  Kevin Ryde  <user42@zip.com.au>
+
+	* documentation.scm (file-commentary): Move make-regexp into
+	file-commentary so that it's possible to get to the repl prompt when
+	regexps are not available.
+
+2006-05-09  Kevin Ryde  <user42@zip.com.au>
+
+	* threads.scm (n-par-for-each, n-for-each-par-map): Two more spots
+	where `futures' should become `threads' from Marius' change of
+	2006-01-29.
+
 2006-03-04  Ludovic Courtès  <ludovic.courtes@laas.fr>
 
 	* ice-9/boot-9.scm (make-autoload-interface): Don't call `set-car!' if

ice-9/documentation.scm

@@ -90,14 +90,21 @@
 ;;
 ;; commentary extraction
 ;;
-(define default-in-line-re (make-regexp "^;;; Commentary:"))
-(define default-after-line-re (make-regexp "^;;; Code:"))
-(define default-scrub (let ((dirt (make-regexp "^;+")))
-                        (lambda (line)
-                          (let ((m (regexp-exec dirt line)))
-                            (if m (match:suffix m) line)))))
 
 (define (file-commentary filename . cust) ; (IN-LINE-RE AFTER-LINE-RE SCRUB)
+   
+  ;; These are constants but are not at the top level because the repl in
+  ;; boot-9.scm loads session.scm which in turn loads this file, and we want
+  ;; that to work even even when regexps are not available (ie. make-regexp
+  ;; doesn't exist), as for instance is the case on mingw.
+  ;;
+  (define default-in-line-re (make-regexp "^;;; Commentary:"))
+  (define default-after-line-re (make-regexp "^;;; Code:"))
+  (define default-scrub (let ((dirt (make-regexp "^;+")))
+			  (lambda (line)
+			    (let ((m (regexp-exec dirt line)))
+			      (if m (match:suffix m) line)))))
+       
   ;; fixme: might be cleaner to use optargs here...
   (let ((in-line-re (if (> 1 (length cust))
                         default-in-line-re

ice-9/threads.scm

@@ -86,7 +86,7 @@
 	(threads '()))
     (do ((i 0 (+ 1 i)))
 	((= i n)
-	 (for-each join-thread futures))
+	 (for-each join-thread threads))
       (set! threads
 	    (cons (begin-thread
 		   (let loop ()
@@ -115,7 +115,7 @@ of applying P-PROC on ARGLISTS."
 	 (result results))
     (do ((i 0 (+ 1 i)))
 	((= i n)
-	 (for-each join-thread futures))
+	 (for-each join-thread threads))
       (set! threads
 	    (cons (begin-thread
 		   (let loop ()