From 1cbbd0cbd23266b8e8f649c1582da2b092ac48a5 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 5 Feb 2007 18:26:38 +0000
Subject: [PATCH] Updates to make sure that Edwin can be compiled by previous
 snapshot.

---
 v7/src/edwin/decls.scm | 32 ++++++++++++++++++++++----------
 v7/src/edwin/edwin.sf  | 25 +++++++++++++++++--------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/v7/src/edwin/decls.scm b/v7/src/edwin/decls.scm
index 2e576170c..1de7c4ca4 100644
--- a/v7/src/edwin/decls.scm
+++ b/v7/src/edwin/decls.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: decls.scm,v 1.80 2007/01/05 21:19:23 cph Exp $
+$Id: decls.scm,v 1.81 2007/02/05 18:26:37 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -53,15 +53,27 @@ USA.
 				   true))))))))
 	      (if (not (null? reasons))
 		  (begin
-		    (write-notification-line
-		     (lambda (port)
-		       (write-string "Processing " port)
-		       (write source port)
-		       (write-string " because of:" port)
-		       (for-each (lambda (reason)
-				   (write-char #\space port)
-				   (write reason port))
-				 reasons)))
+		    (if (environment-bound? system-global-environment
+					    'write-notification-line)
+			(write-notification-line
+			 (lambda (port)
+			   (write-string "Processing " port)
+			   (write source port)
+			   (write-string " because of:" port)
+			   (for-each (lambda (reason)
+				       (write-char #\space port)
+				       (write reason port))
+				     reasons)))
+			(begin
+			  (fresh-line)
+			  (write-string "Processing ")
+			  (write source)
+			  (write-string " because of:")
+			  (for-each (lambda (reason)
+				      (write-char #\space)
+				      (write reason))
+				    reasons)
+			  (newline)))
 		    (fluid-let ((sf/default-syntax-table environment)
 				(sf/default-declarations
 				 (map (lambda (dependency)
diff --git a/v7/src/edwin/edwin.sf b/v7/src/edwin/edwin.sf
index 461bf0ed9..aca3fffc5 100644
--- a/v7/src/edwin/edwin.sf
+++ b/v7/src/edwin/edwin.sf
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: edwin.sf,v 1.36 2007/01/05 21:19:23 cph Exp $
+$Id: edwin.sf,v 1.37 2007/02/05 18:26:38 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -52,13 +52,22 @@ USA.
 
 (let ((read-class-definitions
        (lambda (filename)
-	 (with-notification
-	     (lambda (port)
-	       (write-string "Pre-loading class definitions from " port)
-	       (write filename port))
-	   (lambda ()
-	     (syntax* (read-file (string-append filename ".scm"))
-		      (->environment '(EDWIN WINDOW))))))))
+	 (if (environment-bound? system-global-environment 'with-notification)
+	     (with-notification
+		 (lambda (port)
+		   (write-string "Pre-loading class definitions from " port)
+		   (write filename port))
+	       (lambda ()
+		 (syntax* (read-file (string-append filename ".scm"))
+			  (->environment '(EDWIN WINDOW)))))
+	     (begin
+	       (fresh-line)
+	       (write-string "Pre-loading class definitions from ")
+	       (write filename)
+	       (syntax* (read-file (string-append filename ".scm"))
+			(->environment '(EDWIN WINDOW)))
+	       (write-string " -- done")
+	       (newline))))))
   (read-class-definitions "window")
   (read-class-definitions "utlwin")
   (read-class-definitions "modwin")
-- 
2.25.1