From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 5 Apr 1989 18:11:32 +0000 (+0000)
Subject: Change `load-edwin-file' to default the directory of the input
X-Git-Tag: 20090517-FFI~12198
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=c5b271dcc806c491a0f67c71fff23ebc9f054825;p=mit-scheme.git

Change `load-edwin-file' to default the directory of the input
pathname to the library directory.
---

diff --git a/v7/src/edwin/autold.scm b/v7/src/edwin/autold.scm
index 3c4568eb5..a761036c4 100644
--- a/v7/src/edwin/autold.scm
+++ b/v7/src/edwin/autold.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/autold.scm,v 1.40 1989/03/15 19:08:39 cph Exp $
+;;;	$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/autold.scm,v 1.41 1989/04/05 18:11:32 cph Exp $
 ;;;
 ;;;	Copyright (c) 1986, 1989 Massachusetts Institute of Technology
 ;;;
@@ -170,17 +170,15 @@
 ;;;; Loading
 
 (define (load-edwin-file filename package #!optional purify?)
-  (temporary-message "Loading file \""
-		     (pathname->string (->pathname filename))
-		     "\"")
-  (let ((scode (fasload filename true)))
-    (if (or (default-object? purify?) purify?) (purify scode))
-    (scode-eval scode (->environment package)))
-  (append-message " -- done"))
+  (let ((pathname
+	 (merge-pathnames (->pathname filename) edwin-binary-directory)))    (temporary-message "Loading file \"" (pathname->string pathname) "\"")
+    (let ((scode (fasload pathname true)))
+      (if (or (default-object? purify?) purify?) (purify scode))
+      (scode-eval scode (->environment package))))  (append-message " -- done"))
 
 (define-variable "Load File Default"
   "Pathname given as default for \\[Load File]."
-  (merge-pathnames (string->pathname "FOO.BIN.0") edwin-binary-directory))
+  edwin-binary-directory)
 
 (define-command ("Load File" argument)
   "Load an Edwin binary file.
@@ -197,4 +195,4 @@ An argument, if given, means purify the file too."
 			   (map (lambda (library)
 				  (cons (symbol->string (car library))
 					library))
-				known-libraries))))
\ No newline at end of file
+				known-libraries))))