Make WORKING-DIRECTORY-PATHNAME and *DEFAULT-PATHNAME-DEFAULTS* be

different for each CMDL.  Change SET-WORKING-DIRECTORY-PATHNAME! so
that it only changes the working directory of the Scheme process if
the CMDL is the initial top-level REPL.

The end result of these changes is to make the working directory of an
Edwin inferior REPL buffer be independent of the global working
directory.

diff --git a/v7/src/runtime/rep.scm b/v7/src/runtime/rep.scm
index b5c9f551779ca1d53a279e36a53a6c54f64ed5f5..a460cb270614cdf0f6be472ff910e4757c7a2005 100644 (file)
--- a/v7/src/runtime/rep.scm
+++ b/v7/src/runtime/rep.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: rep.scm,v 14.31 1993/07/31 03:11:54 cph Exp $
+$Id: rep.scm,v 14.32 1993/07/31 03:34:12 cph Exp $
 
 Copyright (c) 1988-93 Massachusetts Institute of Technology
 
@@ -138,38 +138,49 @@ MIT in each case. |#
                        *default-pathname-defaults*))
             (let loop ((message message))
               (loop
-               (call-with-current-continuation
-                (lambda (continuation)
-                  (bind-restart 'ABORT
-                      (string-append "Return to "
-                                     (if (repl? cmdl)
-                                         "read-eval-print"
-                                         "command")
-                                     " level "
-                                     (number->string (cmdl/level cmdl))
-                                     ".")
-                      (lambda (#!optional message)
-                        (continuation
-                         (if (default-object? message)
-                             (cmdl-message/strings "Abort!")
-                             message)))
-                    (lambda (restart)
-                      (restart/put! restart make-cmdl cmdl)
-                      (with-interrupt-mask interrupt-mask/all
-                        (lambda (interrupt-mask)
-                          interrupt-mask
-                          (unblock-thread-events)
-                          (message cmdl)
-                          (call-with-current-continuation
-                           (lambda (continuation)
-                             (with-create-thread-continuation continuation
-                               (lambda ()
-                                 ((cmdl/driver cmdl) cmdl)))))))))))))))))
+               (bind-abort-restart cmdl
+                 (lambda ()
+                   (with-interrupt-mask interrupt-mask/all
+                     (lambda (interrupt-mask)
+                       interrupt-mask
+                       (unblock-thread-events)
+                       (message cmdl)
+                       (call-with-current-continuation
+                        (lambda (continuation)
+                          (with-create-thread-continuation continuation
+                            (lambda ()
+                              ((cmdl/driver cmdl) cmdl)))))))))))))))
     (if operation
        (operation cmdl thunk)
        (with-thread-mutex-locked (port/thread-mutex (cmdl/port cmdl))
          thunk))))
 
+(define (bind-abort-restart cmdl thunk)
+  (call-with-current-continuation
+   (lambda (continuation)
+     (bind-restart 'ABORT
+        (string-append "Return to "
+                       (if (repl? cmdl)
+                           "read-eval-print"
+                           "command")
+                       " level "
+                       (number->string (cmdl/level cmdl))
+                       ".")
+        (lambda (#!optional message)
+          (continuation
+           (cmdl-message/append
+            (cmdl-message/active
+             (lambda (port)
+               ;; Inform the port that the default directory has changed.
+               (port/set-default-directory port
+                                           (working-directory-pathname))))
+            (if (default-object? message)
+                (cmdl-message/strings "Abort!")
+                message))))
+       (lambda (restart)
+        (restart/put! restart make-cmdl cmdl)
+        (thunk))))))
+
 (define *nearest-cmdl*)
 
 (define (nearest-cmdl)