From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 10 May 2001 18:34:56 +0000 (+0000)
Subject: Simplify CATCH-FILE-ERRORS so that the error-handling procedure always
X-Git-Tag: 20090517-FFI~2828
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=49f075c0d27d937032b9c61d6e192d36e242da41;p=mit-scheme.git

Simplify CATCH-FILE-ERRORS so that the error-handling procedure always
gets the condition as an argument.
---

diff --git a/v7/src/edwin/filcom.scm b/v7/src/edwin/filcom.scm
index 78675c1c0..1090a4397 100644
--- a/v7/src/edwin/filcom.scm
+++ b/v7/src/edwin/filcom.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: filcom.scm,v 1.214 2001/05/07 18:36:50 cph Exp $
+;;; $Id: filcom.scm,v 1.215 2001/05/10 18:34:56 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2001 Massachusetts Institute of Technology
 ;;;
@@ -118,7 +118,7 @@ procedures are called."
 		(let ((error?
 		       (not
 			(catch-file-errors
-			 (lambda () #f)
+			 (lambda (condition) condition #f)
 			 (lambda () (read-buffer buffer pathname #t))))))
 		  (if error?
 		      (do ((hooks
@@ -181,7 +181,7 @@ procedures are called."
 	  buffer))))
 
 (define (file-test-no-errors test . args)
-  (catch-file-errors (lambda () #f)
+  (catch-file-errors (lambda (condition) condition #f)
 		     (lambda () (apply test args))))
 
 (define (file-newer-than-file? a b)
@@ -194,7 +194,7 @@ procedures are called."
 (define (load-find-file-initialization buffer pathname)
   (let ((pathname
 	 (catch-file-errors
-	  (lambda () #f)
+	  (lambda (condition) condition #f)
 	  (lambda () (os/find-file-initialization-filename pathname)))))
     (if pathname
 	(let ((database
@@ -203,7 +203,7 @@ procedures are called."
 		  (bind-condition-handler (list condition-type:error)
 		      evaluation-error-handler
 		    (lambda ()
-		      (catch-file-errors (lambda () #f)
+		      (catch-file-errors (lambda (condition) condition #f)
 			(lambda ()
 			  (fluid-let ((load/suppress-loading-message? #t))
 			    (load pathname