merge from 1.8 branch

guile-readline/.cvsignore

@@ -14,8 +14,11 @@ config.status
 config.sub
 configure
 depcomp
+guile-readline-config.h
+guile-readline-config.h.in
 install-sh
 libtool
 ltmain.sh
 missing
 mkinstalldirs
+stamp-h1

guile-readline/Makefile.am

@@ -26,7 +26,7 @@ DEFS = @DEFS@ @EXTRA_DEFS@
 ## Check for headers in $(srcdir)/.., so that #include
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
 ## building.
-INCLUDES = -I.. -I$(srcdir)/..
+INCLUDES = -I. -I.. -I$(srcdir)/..
 
 GUILE_SNARF = ../libguile/guile-snarf
 

guile-readline/configure.in

@@ -2,7 +2,9 @@ AC_PREREQ(2.50)
 
 AC_INIT(guile-readline,
         m4_esyscmd(. ../GUILE-VERSION && echo -n ${GUILE_VERSION}))
+AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR(readline.c)
+AM_CONFIG_HEADER([guile-readline-config.h])
 AM_INIT_AUTOMAKE([foreign no-define])
 
 . $srcdir/../GUILE-VERSION
@@ -58,7 +60,8 @@ ac_cv_var_rl_pre_input_hook=yes,
 ac_cv_var_rl_pre_input_hook=no)])
 AC_MSG_RESULT($ac_cv_var_rl_pre_input_hook)
 if test $ac_cv_var_rl_pre_input_hook = yes; then
-  AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK)
+  AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK,1,
+            [Define if rl_pre_input_hook is available.])
 fi
 
 
@@ -107,7 +110,8 @@ guile_cv_sigwinch_sa_restart_cleared=no,
 guile_cv_sigwinch_sa_restart_cleared=yes))
 AC_MSG_RESULT($guile_cv_sigwinch_sa_restart_cleared)
 if test $guile_cv_sigwinch_sa_restart_cleared = yes; then
-  AC_DEFINE(GUILE_SIGWINCH_SA_RESTART_CLEARED)
+  AC_DEFINE(GUILE_SIGWINCH_SA_RESTART_CLEARED, 1,
+    [Define if readline disables SA_RESTART.])
 fi
 
 AC_CACHE_CHECK([for rl_getc_function pointer in readline],

guile-readline/readline.c

@@ -22,11 +22,9 @@
 
 
 
-#if HAVE_CONFIG_H
+/* Include private, configure generated header (i.e. config.h). */
-#  include <config.h>
+#include "guile-readline-config.h"
-#endif
 
-#include "libguile/_scm.h"
 #ifdef HAVE_RL_GETC_FUNCTION
 #include "libguile.h"
 #include "libguile/gh.h"

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 (file-commentary filename . cust) ; (IN-LINE-RE AFTER-LINE-RE SCRUB)
-(define default-scrub (let ((dirt (make-regexp "^;+")))
+   
+  ;; 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)))))
        
-(define (file-commentary filename . cust) ; (IN-LINE-RE AFTER-LINE-RE SCRUB)
   ;; 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 ()