--- a/patches	Sat Nov 09 02:03:57 1996 +0100
+++ b/patches	Sat Nov 09 19:20:50 1996 +0100
@@ -129,7 +129,20 @@
 ].
 !
 
-"/ Smalltalk installAutoloadedClassesFrom:'include/abbrev.stc'.
+"/
+"/ read the abbrev.stc file, extract class names
+"/ and install all nonExisting classes as autoloaded
+"/
+|needToReactivate|
+
+needToReactivate := HistoryManager isActive.
+HistoryManager deactivate.
+Class withoutUpdatingChangesDo:[   
+    'installing autoloaded classes ...' printCR.
+Smalltalk silentLoading:false.
+    Smalltalk installAutoloadedClassesFrom:'include/abbrev.stc'.
+].
+needToReactivate ifTrue:[HistoryManager activate].
 !
 
 "/
@@ -169,7 +182,7 @@
 Display notNil ifTrue:[
     Smalltalk at:#Window put:(Display class).
     Smalltalk at:#Screen put:(Display class).
-    Smalltalk at:#Sensor put:(WindowSensor class).
+    Smalltalk at:#Sensor put:Display.
 ].
 
 "/

--- a/smalltalk.rc	Sat Nov 09 02:03:57 1996 +0100
+++ b/smalltalk.rc	Sat Nov 09 19:20:50 1996 +0100
@@ -230,31 +230,14 @@
 "/ (it will not be shown when coming up via a snapshot image)
 "/
 Smalltalk addStartBlock:[
-    |loader needToReactivate|
-
-    needToReactivate := HistoryManager isActive.
-    HistoryManager deactivate.
-
     LicenceBox autoload.
 
-    "/ fetch autoloaded classes in the meanwhile ...
-    loader := [
-	Class withoutUpdatingChangesDo:[   
-	    'installing autoloaded classes ...' printCR.
-	    Smalltalk installAutoloadedClassesFrom:'include/abbrev.stc'.
-	].
-	needToReactivate ifTrue:[HistoryManager activate].
-    ] forkAt:Processor userBackgroundPriority.
-
     LicenceBox licenceRejectSignal handle:[:ex|
 	Smalltalk exit
     ] do:[
 	LicenceBox open.
 	Smalltalk at:#LicenceBox put:nil.
     ].
-
-    "/ wait for loader
-    loader waitUntilTerminated.
 ].
 
 "/