From cfa6c9b3c3e0b1e9a73d6f880c698ddf8782178c Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 26 Nov 2007 05:15:33 +0000
Subject: [PATCH] Revert change to WITH-EVAL-UNIT, which broke building of C
 back end. (Specifically, the reference to "base/make" in
 "compiler/machines/C/make.scm".)

---
 v7/src/runtime/load.scm       | 11 +++--------
 v7/src/ssp/xhtml-expander.scm | 16 +++++++++-------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/v7/src/runtime/load.scm b/v7/src/runtime/load.scm
index a726cb5c1..b57b0aef6 100644
--- a/v7/src/runtime/load.scm
+++ b/v7/src/runtime/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 14.100 2007/10/12 02:12:11 cph Exp $
+$Id: load.scm,v 14.101 2007/11/26 05:15:32 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -250,13 +250,8 @@ USA.
     (thunk)))
 
 (define (with-eval-unit uri thunk)
-  (let ((uri (->absolute-uri uri 'WITH-EVAL-UNIT)))
-    (fluid-let ((*eval-unit* uri))
-      (let ((pathname (uri->pathname uri #f)))
-	(if pathname
-	    (with-working-directory-pathname (directory-pathname pathname)
-	      thunk)
-	    (thunk))))))
+  (fluid-let ((*eval-unit* (->absolute-uri uri 'WITH-EVAL-UNIT)))
+    (thunk)))
 
 (define (current-eval-unit #!optional error?)
   (let ((unit *eval-unit*))
diff --git a/v7/src/ssp/xhtml-expander.scm b/v7/src/ssp/xhtml-expander.scm
index d3189ca6e..2d9679bed 100644
--- a/v7/src/ssp/xhtml-expander.scm
+++ b/v7/src/ssp/xhtml-expander.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xhtml-expander.scm,v 1.14 2007/10/12 02:13:17 cph Exp $
+$Id: xhtml-expander.scm,v 1.15 2007/11/26 05:15:33 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -77,13 +77,15 @@ USA.
   (let ((pathname (merge-pathnames pathname)))
     (with-eval-unit (pathname->uri pathname)
       (lambda ()
-	(with-load-environment environment
+	(with-working-directory-pathname (directory-pathname pathname)
 	  (lambda ()
-	    (fluid-let ((*sabbr-table* (make-eq-hash-table)))
-	      (read-xml-file pathname
-			     `((scheme ,(pi-expander environment))
-			       (svar ,svar-expander)
-			       (sabbr ,sabbr-expander))))))))))
+	    (with-load-environment environment
+	      (lambda ()
+		(fluid-let ((*sabbr-table* (make-eq-hash-table)))
+		  (read-xml-file pathname
+				 `((scheme ,(pi-expander environment))
+				   (svar ,svar-expander)
+				   (sabbr ,sabbr-expander))))))))))))
 
 (define (make-expansion-environment pathname)
   (let ((environment (extend-top-level-environment expander-environment)))
-- 
2.25.1