From 884d5faf3e35068a2f3ca65691dad16f61005adc Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Wed, 16 Sep 1998 20:28:18 +0000
Subject: [PATCH] ...

original commit: f9c59091ee2310d5992b57661b467ea0c6bf79fb
---
 collects/framework/autosave.ss | 50 ++++++++++++++++++----------------
 collects/framework/editor.ss   |  5 ++--
 collects/framework/test.ss     |  6 ++--
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/collects/framework/autosave.ss b/collects/framework/autosave.ss
index b9b558f5..fda0548d 100644
--- a/collects/framework/autosave.ss
+++ b/collects/framework/autosave.ss
@@ -5,31 +5,33 @@
   
   (define register
     (let* ([objects null]
-	   [timer
-	    (make-object
-	     (class timer% ()
-	       (inherit start)
-	       (override
-		 [notify
-		  (lambda ()
-		    (when (preferences:get 'framework:autosaving-on?)
-		      (set! objects
-			    (let loop ([list objects])
-			      (if (null? list)
-				  null
-				  (let ([object (weak-box-value (car list))])
-				    (if object
-					(begin
-					  (send object do-autosave)
-					  (cons (car list) (loop (cdr list))))
-					(loop (cdr list))))))))
-		    (let ([seconds (preferences:get 'framework:autosave-delay)])
-		      (start (* 1000 seconds) #t)))])
-	       (sequence
-		 (super-init)
-		 (let ([seconds (preferences:get 'framework:autosave-delay)])
-		   (start (* 1000 seconds) #t)))))])
+	   [autosave-timer%
+	    (class timer% ()
+	      (inherit start)
+	      (override
+		[notify
+		 (lambda ()
+		   (when (preferences:get 'framework:autosaving-on?)
+		     (set! objects
+			   (let loop ([list objects])
+			     (if (null? list)
+				 null
+				 (let ([object (weak-box-value (car list))])
+				   (if object
+				       (begin
+					 (send object do-autosave)
+					 (cons (car list) (loop (cdr list))))
+				       (loop (cdr list))))))))
+		   (let ([seconds (preferences:get 'framework:autosave-delay)])
+		     (start (* 1000 seconds) #t)))])
+	      (sequence
+		(super-init)
+		(let ([seconds (preferences:get 'framework:autosave-delay)])
+		  (start (* 1000 seconds) #t))))]
+	   [timer #f])
       (lambda (b)
+	(unless timer
+	  (set! timer (make-object autosave-timer%)))
 	(set! objects
 	      (let loop ([objects objects])
 		(cond
diff --git a/collects/framework/editor.ss b/collects/framework/editor.ss
index 4cffa0f4..1d4891f6 100644
--- a/collects/framework/editor.ss
+++ b/collects/framework/editor.ss
@@ -19,9 +19,10 @@
 
   (define make-basic%
     (mixin (editor<%>) (basic<%>) args
-      (inherit modified? get-filename save-file canvases
+      (inherit modified? get-filename save-file
 	       refresh-delayed? 
-	       get-frame get-keymap
+	       get-frame
+	       get-keymap
 	       get-max-width get-admin set-filename)
       (rename [super-set-modified set-modified]
 	      [super-on-save-file on-save-file]
diff --git a/collects/framework/test.ss b/collects/framework/test.ss
index 66113289..043d7009 100644
--- a/collects/framework/test.ss
+++ b/collects/framework/test.ss
@@ -16,11 +16,13 @@
 (printf "5~n")
 (require-library "sig.ss" "framework")
 (printf "6~n")
+(define framework@ (require-library "frameworkr.ss" "framework"))
+(printf "7~n")
 (invoke-unit/sig
  (compound-unit/sig
    (import)
    (link [M : mred-interfaces^ (mred-interfaces@)]
 	 [C : mzlib:core^ ((require-library "corer.ss"))]
-	 [F : framework^ ((require-library "frameworkr.ss" "framework") C M)])
+	 [F : framework^ (framework@ C M)])
    (export)))
-(printf "7~n")
+(printf "8~n")