--- a/Smalltalk.st	Thu Apr 14 21:21:46 2005 +0200
+++ b/Smalltalk.st	Fri Apr 15 10:26:48 2005 +0200
@@ -29,6 +29,9 @@
 	category:'System-Support'
 !
 
+Smalltalk comment:'declared from: ..\..\..\stx\libbasic\abbrev.stc'
+!
+
 !Smalltalk class methodsFor:'documentation'!
 
 copyright
@@ -3267,12 +3270,12 @@
      If revisionOrNil is non-nil, set it up to load exactly that revision
      (otherwise, the newest revision will be loaded"
 
-    self 
-	installAutoloadedClassNamed:clsName
-	category:cat
-	package:package
-	revision:revisionOrNil
-	numClassInstVars:nil.
+    ^ self 
+        installAutoloadedClassNamed:clsName
+        category:cat
+        package:package
+        revision:revisionOrNil
+        numClassInstVars:nil.
 !
 
 installAutoloadedClassNamed:clsName category:cat package:package revision:revisionOrNil numClassInstVars:numClassInstVarsOrNil
@@ -3287,31 +3290,32 @@
 
     "/ install if not already compiled-in
     (cls := self at:clsSym) isNil ifTrue:[
-	Autoload subclass:clsSym
-	    instanceVariableNames:''
-	    classVariableNames:''
-	    poolDictionaries:''
-	    category:cat
-	    inEnvironment:Smalltalk.
-
-	cls := self at:clsSym.
-	cls isNil ifTrue:[
-	    ('Smalltalk [warning]: failed to install ' , clsName , ' as autoloaded.') infoPrintCR.
-	] ifFalse:[
-	    cls package:package asSymbol.
-	    revisionOrNil notNil ifTrue:[
-		cls setBinaryRevision:revisionOrNil
-	    ]
-	]    
+        Autoload subclass:clsSym
+            instanceVariableNames:''
+            classVariableNames:''
+            poolDictionaries:''
+            category:cat
+            inEnvironment:Smalltalk.
+
+        cls := self at:clsSym.
+        cls isNil ifTrue:[
+            ('Smalltalk [warning]: failed to install ' , clsName , ' as autoloaded.') infoPrintCR.
+        ] ifFalse:[
+            cls package:package asSymbol.
+            revisionOrNil notNil ifTrue:[
+                cls setBinaryRevision:revisionOrNil
+            ]
+        ]    
     ] ifFalse:[
-	"/ class already present - however, check for category/package change
-	package ~= cls package ifTrue:[
-	    cls package:package asSymbol.
-	].
-	cat ~= cls category ifTrue:[
-	    cls category:cat.
-	].
-    ].
+        "/ class already present - however, check for category/package change
+        package ~= cls package ifTrue:[
+            cls package:package asSymbol.
+        ].
+        cat ~= cls category ifTrue:[
+            cls category:cat.
+        ].
+    ].
+    ^ cls.
 
     "Created: / 5.11.1998 / 15:10:25 / cg"
 !
@@ -3390,7 +3394,11 @@
      abbreviation (className-to-fileName mapping) table.
      This takes some time ..."
 
-    |s2 l clsName abbrev package cat numClassInstVars words w|
+    |s2 l abbrevFileName clsName cls abbrev package cat numClassInstVars words w|
+
+    anAbbrevFileStream isFileStream ifTrue:[
+        abbrevFileName := anAbbrevFileStream pathName
+    ].
 
     KnownPackages isNil ifTrue:[
         KnownPackages := Set new.
@@ -3445,7 +3453,16 @@
 
                     "/ '  autoloaded: ' print. clsName print. ' in ' print. cat printCR.
 
-                    self installAutoloadedClassNamed:clsName category:cat package:package revision:nil numClassInstVars:numClassInstVars.
+                    cls := self 
+                        installAutoloadedClassNamed:clsName 
+                        category:cat 
+                        package:package 
+                        revision:nil 
+                        numClassInstVars:numClassInstVars.
+
+                    abbrevFileName notNil ifTrue:[
+                        cls setComment:('declared from: ', abbrevFileName).
+                    ].
                 ]
             ]
         ]
@@ -6382,5 +6399,5 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.670 2005-04-05 12:03:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.671 2005-04-15 08:26:48 cg Exp $'
 ! !