--- a/Autoload.st	Sat Feb 08 20:04:13 1997 +0100
+++ b/Autoload.st	Sat Feb 08 20:06:59 1997 +0100
@@ -430,7 +430,22 @@
     "Created: 22.5.1996 / 23:04:49 / stefan"
 !
 
-subclass:a1 instanceVariableNames:a2 classVariableNames:a3 poolDictionaries:a4 category:a5
+subclass:nameSymbol instanceVariableNames:instVarNames classVariableNames:cVarNames poolDictionaries:pools category:cat
+    "catch subclass creation - this forces missing superclasses to be 
+     loaded first"
+
+    ^ self
+        subclass:nameSymbol     
+        instanceVariableNames:instVarNames 
+        classVariableNames:cVarNames 
+        poolDictionaries:pools 
+        category:cat
+        inEnvironment:(Class nameSpaceQuerySignal raise)
+
+    "Modified: 8.2.1997 / 20:06:22 / cg"
+!
+
+subclass:nameSymbol instanceVariableNames:instVarNames classVariableNames:cVarNames poolDictionaries:poolDicts category:cat inEnvironment:aNameSpace
     "catch subclass creation - this forces missing superclasses to be 
      loaded first"
 
@@ -438,20 +453,24 @@
 
     "take care: subclassing Autoload must still be possible"
     (self == Autoload) ifTrue:[
-	^ super 
-	    subclass:a1 
-	    instanceVariableNames:a2
-	    classVariableNames:a3
-	    poolDictionaries:a4
-	    category:a5
+        ^ super 
+            subclass:nameSymbol 
+            instanceVariableNames:instVarNames
+            classVariableNames:cVarNames
+            poolDictionaries:poolDicts
+            category:cat
+            inEnvironment:aNameSpace
     ].
+
     newClass := self autoload.
     sel := thisContext selector.
     args := thisContext args.
     newClass notNil ifTrue:[
-	^ newClass perform:sel withArguments:args
+        ^ newClass perform:sel withArguments:args
     ].
     ^ nil
+
+    "Created: 8.2.1997 / 19:42:47 / cg"
 ! !
 
 !Autoload class methodsFor:'queries'!
@@ -495,6 +514,6 @@
 !Autoload class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.64 1997-01-22 17:35:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.65 1997-02-08 19:06:59 cg Exp $'
 ! !
 Autoload initialize!