--- a/smalltalk.rc	Thu Jan 19 10:43:25 2006 +0100
+++ b/smalltalk.rc	Mon Jan 30 18:50:09 2006 +0100
@@ -320,6 +320,10 @@
 !
 
 "/
+"/ Memory settings. NOTE that all these settings may be overwritten by
+"/                  settings.stx which stores the Launcher's settings.
+
+"/
 "/ this starts the incremental GC earlier
 "/ (default is 500000)
 "/ the number given is the number of bytes which have to be allocated
@@ -390,28 +394,27 @@
 "/ For now, this is experimental. Once the best numbers
 "/ have been found, I'll hardwire them and document it ...
 
-|a needToReactivate|
+|tenureParams|
 
 ObjectMemory newSpaceSize > (500*1024) ifTrue:[
-    a := #(nil nil nil nil -16 -4 -2 -2 0 0 16 nil) copy.
+    tenureParams := #(nil nil nil nil -16 -4 -2 -2 0 0 16 nil) copy.
 ] ifFalse:[
 "/         min max cpy /32 /16 /8 /4 /2 /4 /8 /16 /32 "
     "/
     "/ slow tenure - keeps objects longer in newSpace,
     "/  producing more scavenge overhead, but releasing IGC somewhat
     "/
-"/  a := #(nil nil nil -100 -8 -4 -1  1 2  4  8   16 nil) copy.
-"/  a := #(nil nil nil nil -16 -4  0  0  0 4 16 nil) copy.
+"/  tenureParams := #(nil nil nil -100 -8 -4 -1  1  2 4 8 16 nil) copy.
+"/  tenureParams := #(nil nil nil nil -16 -4  0  0  0 4 16 nil) copy.
 
-    "fast tenure"
     "/
     "/ fast tenure - moves objects earlier into oldSpace,
     "/ releasing newSpace collector; however, the oldSpace IGC
     "/ may have more work to do.
     "/
-    a := #(nil nil nil nil -20 -8 -3 -1 -1 1 16 nil) copy.
+    tenureParams := #(nil nil nil nil -20 -8 -3 -1 -1 1 16 nil) copy.
 ].
-ObjectMemory tenureParameters:a.
+ObjectMemory tenureParameters:tenureParams.
 !
 
 "/
@@ -449,8 +452,8 @@
 "/
 
 (Smalltalk isStandAloneApp not
-and:[Smalltalk isPlugin not
-and:[Display notNil
+ and:[Smalltalk isPlugin not
+ and:[Display notNil
 ]]) ifTrue:[
     ((Smalltalk commandLineArguments includes:'--noLicenceBox')
      or:[(Smalltalk commandLineArguments includes:'--quick')
@@ -467,7 +470,7 @@
 		    'smalltalk.rc [info]: licence conditions not accepted.' infoPrintCR.
 		    Smalltalk exit
 		].
-		Smalltalk at:#LicenceBox put:nil.
+		Smalltalk removeClass:LicenceBox.
 	    ].
 	]
     ]
@@ -522,6 +525,7 @@
 
 Smalltalk at:#Browser put:SystemBrowser.
 !
+|file|
 
 "/
 "/ read private (per user) stuff
@@ -531,19 +535,18 @@
 
     idx := Smalltalk commandLine indexOf:'-F'.
     file := Smalltalk commandLine at:idx + 1.
-    ('smalltalk.rc [info]: reading ''' , file , '''...') infoPrintCR.
-    Smalltalk fileIn:file.
 ] ifFalse:[
-    'smalltalk.rc [info]: reading ''private.rc''...' infoPrintCR.
-    Smalltalk fileIn:'private.rc'.
+    file := 'private.rc'.
 ].
+('smalltalk.rc [info]: reading ''' , file , '''...') infoPrintCR.
+Smalltalk fileIn:file.
 
 Screen notNil ifTrue:[
     "/
     "/ read saved configuration settings (if any)
     "/
     "/ 'smalltalk.rc [info]: reading ''settings.stx''...' infoPrintCR.
-    Object abortSignal handle:[:ex |
+    AbortOperationRequest handle:[:ex |
 	ex return
     ] do:[
 	(Smalltalk fileIn:'settings.stx') ifTrue:[
@@ -588,11 +591,12 @@
 "/        missing := missing , '''resources'' '.
 "/    ].
 
-    (Smalltalk getPackageFileName:'stx/libbasic/source/Object.st') isNil ifTrue:[
-     (Smalltalk getSystemFileName:'source/Object.st') isNil ifTrue:[
-      (Smalltalk getSystemFileName:'source/source.zip') isNil ifTrue:[
-	(Smalltalk getSystemFileName:'source/libbasic.zip') isNil ifTrue:[
-	  (Smalltalk getSourceFileName:'libbasic/Object.st') isNil ifTrue:[
+    (Smalltalk getPackageFileName:'stx/libbasic/source/Object.st') isNil and:[
+	(Smalltalk getPackageFileName:'stx/libbasic/Object.st') isNil and:[
+	(Smalltalk getSystemFileName:'source/Object.st') isNil and:[
+	(Smalltalk getSystemFileName:'source/source.zip') isNil and:[
+	(Smalltalk getSystemFileName:'source/libbasic.zip') isNil and:[
+	(Smalltalk getSourceFileName:'libbasic/Object.st') isNil and:[
 	    "/
 	    "/ there may still be a SourceCodeManager ...
 	    "/
@@ -604,12 +608,7 @@
 		'***** Also, autoloading may fail if sourceFiles are missing.' errorPrintCR.
 		anyWrong := true.
 		missing := missing , '''source'' '.
-	    ]
-	  ]
-	]
-      ]
-     ]
-    ].
+    ]]]]]]].
 
 "/
 "/ no longer needed - if we have the package,
@@ -658,33 +657,25 @@
 "/ (since all autoload-stuff will already be initialized)
 "/
 ((Smalltalk commandLineArguments includes:'--quick')
-or:[ (Smalltalk commandLineArguments includes:'--faststart')
-or:[ (Smalltalk commandLineArguments includes:'--fastStart')
-or:[ (Smalltalk isPlugin)
+ or:[(Smalltalk commandLineArguments includes:'--faststart')
+ or:[(Smalltalk commandLineArguments includes:'--fastStart')
+ or:[(Smalltalk isPlugin)
 ]]]) ifFalse:[
-    'st.img' asFilename exists ifFalse:[
-	'.' asFilename isWritable ifTrue:[
-	    |doneWithStartupStuff|
+    ('st.img' asFilename exists not and:['.' asFilename isWritable]) ifTrue:[
+	|doneWithStartupStuff|
 
-	    doneWithStartupStuff := Semaphore new.
+	doneWithStartupStuff := Semaphore new.
 
-	    Smalltalk
-		addStartBlock:
-		[
-		    [
-			doneWithStartupStuff wait.
-			   'smalltalk.rc [info]: saving initial image for faster future startup...' infoPrintCR.
-			   ObjectMemory primSnapShotOn:'st.img'
-		    ] forkAt:1
-		].
-
-	    Smalltalk addStartBlock:
-		[
-		    [
-			Delay waitForSeconds:10.
-			doneWithStartupStuff signal
-		    ] forkAt:1
-		].
-	]
-    ]
+	Smalltalk addStartBlock:[
+	    [
+		doneWithStartupStuff wait.
+		   'smalltalk.rc [info]: saving initial image for faster future startup...' infoPrintCR.
+		   ObjectMemory primSnapShotOn:'st.img'
+	    ] forkAt:1.
+	    [
+		Delay waitForSeconds:10.
+		doneWithStartupStuff signal
+	    ] forkAt:1.
+	].
+    ].
 ].