from Version_2_6_10-272-ga9eab76 to Version_2_6_11pre
a: Version_2_6_10-272-ga9eab76
b: Version_2_6_11pre

Help
Common Key Bindings:
p:previous block  n:next block  G:redisplay  q:quit
Extra Bindings for Diff blocks:
RET:visit file/line
diff --git gcl-2.6.10.orig/cmpnew/gcl_cmpflet.lsp gcl-2.6.10/cmpnew/gcl_cmpflet.lsp
index 1c039df..9410614 100755
--- gcl-2.6.10.orig/cmpnew/gcl_cmpflet.lsp
+++ gcl-2.6.10/cmpnew/gcl_cmpflet.lsp
@@ -394,7 +394,8 @@
              (fun-name (car fd))))
    (t (push-args args)
       (wt-nl (c-function-name "L" (fun-cfun (car fd)) (fun-name (car fd))) "(")
-      (dotimes** (n (fun-level (car fd))) (wt "base" n ","))
+      (dotimes** (n (fun-level (car fd))) 
+		 (if (when *closure-p* (zerop n)) (wt "fun->cc.cc_turbo,") (wt "base" n ",")))
       (wt "base")
       (unless (= (fun-level (car fd)) *level*) (wt (fun-level (car fd))))
       (wt ");")
diff --git gcl-2.6.10.orig/cmpnew/gcl_cmpmain.lsp gcl-2.6.10/cmpnew/gcl_cmpmain.lsp
index d675138..9048a44 100755
--- gcl-2.6.10.orig/cmpnew/gcl_cmpmain.lsp
+++ gcl-2.6.10/cmpnew/gcl_cmpmain.lsp
@@ -370,12 +370,15 @@ Cannot compile ~a.~%"
 	   (unless (and (fboundp 'si::init-cmp-anon) (or (si::init-cmp-anon) (fmakunbound 'si::init-cmp-anon)))
 	     (with-open-file
 	      (st (setq gaz (gazonk-name)) :direction :output))
-	     (let ((fi (let ((*compiler-compile* `(defun ,na ,@ (ecase (car tem)
-								       (lambda (cdr tem))
-								       (lambda-block (cddr tem))))))
-			 (compile-file gaz))))
-	       (load fi)
-	       (mdelete-file fi))
+	     (let* ((*compiler-compile* 
+		     `(defun ,na 
+			,@(ecase (car tem)
+				 (lambda (cdr tem))
+				 (lambda-block (cddr tem)))))
+		    (fi (compile-file gaz)))
+	       (when (pathnamep fi)
+		 (load fi)
+		 (mdelete-file fi)))
 	     (unless *keep-gaz* (mdelete-file gaz)))
 	   (or (eq na name) (setf (symbol-function name) (symbol-function na)))
 	 ;; FIXME -- support warnings-p and failures-p.  CM 20041119
diff --git gcl-2.6.10.orig/cmpnew/gcl_cmptop.lsp gcl-2.6.10/cmpnew/gcl_cmptop.lsp
index f9915f1..80830f4 100755
--- gcl-2.6.10.orig/cmpnew/gcl_cmptop.lsp
+++ gcl-2.6.10/cmpnew/gcl_cmptop.lsp
@@ -1722,10 +1722,11 @@
 ;; will let it default to ccb-vs, which will be the value of *ccb-vs*
 ;; prevalent at the time the environment stack was pushed and the
 ;; closure was created.  CM 20031130
+(defvar *closure-p* nil)
 (defun t3local-fun (closure-p clink ccb-vs fun lambda-expr &optional (initial-ccb-vs ccb-vs)
                               &aux (level (if closure-p 0 (fun-level fun)))
 			      (*volatile* (volatile (cadr lambda-expr)))
-			      *downward-closures*)
+			      *downward-closures* (*closure-p* closure-p))
   (declare (fixnum level))
   (if (eq closure-p 'dclosure)
       (return-from t3local-fun
diff --git gcl-2.6.10.orig/configure gcl-2.6.10/configure
index 87579e0..031f7d7 100755
--- gcl-2.6.10.orig/configure
+++ gcl-2.6.10/configure
@@ -5076,7 +5076,7 @@ if ac_fn_c_try_run "$LINENO"; then :
 				TLIBS="$TLIBS -lgmp"
 				echo "#include \"gmp.h\"" >foo.c
 				echo "int main() {return 0;}" >>foo.c
-				MP_INCLUDE=`cpp foo.c | grep /gmp.h | head -n 1 | $AWK '{print $3}' | tr -d '"'`
+				MP_INCLUDE=`cpp foo.c | $AWK '/(\/|\\\\)gmp.h/ {if (!i) print $3;i=1}' | tr -d '"'`
 				rm -f foo.c
 else
   echo "Cannot use dynamic gmp lib"
diff --git gcl-2.6.10.orig/configure.in gcl-2.6.10/configure.in
index 2854100..65766f0 100644
--- gcl-2.6.10.orig/configure.in
+++ gcl-2.6.10/configure.in
@@ -812,7 +812,7 @@ if test $use_gmp = yes ; then
 				TLIBS="$TLIBS -lgmp"
 				echo "#include \"gmp.h\"" >foo.c
 				echo "int main() {return 0;}" >>foo.c
-				MP_INCLUDE=`cpp foo.c | grep /gmp.h | head -n 1 | $AWK '{print $3}' | tr -d '"'`
+				MP_INCLUDE=`cpp foo.c | $AWK '/(\/|\\\\)gmp.h/ {if (!i) print $3;i=1}' | tr -d '"'`
 				rm -f foo.c,
 				echo "Cannot use dynamic gmp lib" , echo "Cannot use dynamic gmp lib" ),
 			echo "Cannot use dynamic gmp lib" ,),
diff --git gcl-2.6.10.orig/lsp/gcl_info.lsp gcl-2.6.10/lsp/gcl_info.lsp
index edf2bd6..7c146d9 100755
--- gcl-2.6.10.orig/lsp/gcl_info.lsp
+++ gcl-2.6.10/lsp/gcl_info.lsp
@@ -1,11 +1,5 @@
 (in-package "SI"  )
 
-(eval-when (compile)
-
-
-(proclaim '(ftype (function (t t &optional fixnum) fixnum) string-match))
-(proclaim '(ftype (function (fixnum) fixnum)
-		  match-beginning match-end)))
 (eval-when (compile eval)
 (defmacro while (test &body body)
   `(slooP::sloop while ,test do ,@ body))
