Fix bug in disk-save/disk-restore by which bands dumped from emacs

were not restartable.

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 5c46f73b332925aa86ee167a8f2d4ff2fa051004..f6c25a1e9e59124a47e59e0497201f0a18c440dc 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.162 1992/11/05 00:22:57 jinx Exp $
+$Id: runtime.pkg,v 14.163 1992/11/12 03:25:33 gjr Exp $
 
 Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
@@ -1810,6 +1810,8 @@ MIT in each case. |#
          disk-save
          dump-world
          identify-world)
+  (export (runtime user-interface)
+         *within-restore-window?*)
   (initialization (initialize-package!)))
 
 (define-package (runtime scode)

diff --git a/v7/src/runtime/savres.scm b/v7/src/runtime/savres.scm
index 6698433c1add247c3ee2a0b76a808bd2b0147616..f7d0a80f7348fb5999091cd0820cff26bf144916 100644 (file)
--- a/v7/src/runtime/savres.scm
+++ b/v7/src/runtime/savres.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/savres.scm,v 14.25 1992/05/23 01:12:47 jinx Exp $
+$Id: savres.scm,v 14.26 1992/11/12 03:25:40 gjr Exp $
 
-Copyright (c) 1988-92 Massachusetts Institute of Technology
+Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -56,6 +56,7 @@ MIT in each case. |#
 
 (define disk-save)
 (define dump-world)
+(define *within-restore-window?* false)
 
 (define (setup-image save-image)
   (lambda (filename #!optional identify)
@@ -70,7 +71,8 @@ MIT in each case. |#
         (if (string? identify) unspecific false))
        (lambda ()
         (set! time-world-saved time)
-        (event-distributor/invoke! event:after-restore)
+        (fluid-let ((*within-restore-window?* true))
+          (event-distributor/invoke! event:after-restore))
         (start-thread-timer)
         (cond ((string? identify)
                (set! world-identification identify)

diff --git a/v7/src/runtime/usrint.scm b/v7/src/runtime/usrint.scm
index 2ea069bb85265cb5bf28254b0cf662c9069e9c73..ef5ae4a1ffd92c766e41811ac740649f8ad427de 100644 (file)
--- a/v7/src/runtime/usrint.scm
+++ b/v7/src/runtime/usrint.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/usrint.scm,v 1.2 1992/06/01 22:23:16 cph Exp $
+$Id: usrint.scm,v 1.3 1992/11/12 03:25:49 gjr Exp $
 
-Copyright (c) 1991-92 Massachusetts Institute of Technology
+Copyright (c) 1991-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -216,12 +216,12 @@ MIT in each case. |#
 
 (define (port/gc-start port)
   (let ((operation (port/operation port 'GC-START)))
-    (if operation
+    (if (and operation (not *within-restore-window?*))
        (operation port))))
 
 (define (port/gc-finish port)
   (let ((operation (port/operation port 'GC-FINISH)))
-    (if operation
+    (if (and operation (not *within-restore-window?*))
        (operation port))))
 
 (define (port/read-start port)

diff --git a/v8/src/runtime/runtime.pkg b/v8/src/runtime/runtime.pkg
index 5c46f73b332925aa86ee167a8f2d4ff2fa051004..f6c25a1e9e59124a47e59e0497201f0a18c440dc 100644 (file)
--- a/v8/src/runtime/runtime.pkg
+++ b/v8/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.162 1992/11/05 00:22:57 jinx Exp $
+$Id: runtime.pkg,v 14.163 1992/11/12 03:25:33 gjr Exp $
 
 Copyright (c) 1988-1992 Massachusetts Institute of Technology
 
@@ -1810,6 +1810,8 @@ MIT in each case. |#
          disk-save
          dump-world
          identify-world)
+  (export (runtime user-interface)
+         *within-restore-window?*)
   (initialization (initialize-package!)))
 
 (define-package (runtime scode)