--- a/Smalltalk.st	Mon Sep 15 19:59:47 2008 +0200
+++ b/Smalltalk.st	Fri Sep 19 12:43:10 2008 +0200
@@ -728,16 +728,17 @@
 windowSystemName
     "not yet fully implemented (I have to figure out, what squeak returns in each case...)"
 
-    OperatingSystem isMSWINDOWSlike ifTrue:[
-	Screen current platformName = 'WIN32' ifTrue:[
-	    ^ 'Win32'
-	].
-	self halt.
-    ].
-    ^ 'Unknown'
-
-    "
-     Smalltalk windowSystemName -> 'Win32'
+    |platformName|
+
+    platformName := Screen current platformName.
+    platformName = #WIN32 ifTrue:[
+        ^ #Win32.
+    ].
+    ^ platformName.
+
+    "
+     Smalltalk windowSystemName 
+                                -> 'Win32'
     "
 ! !
 
@@ -3821,37 +3822,42 @@
 
     "/ 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, if unloaded, check for category/package change
-	cls isLoaded ifFalse:[
-	    package ~= cls package ifTrue:[
-		cls package:package asSymbol.
-	    ].
-	    cat ~= cls category ifTrue:[
-		cls category:cat.
-	    ].
-	]
+        "/ class already present - however, if unloaded, check for category/package change
+        cls isLoaded ifFalse:[
+            package ~= cls package ifTrue:[
+                cls withoutUpdatingChangesDo:[
+                    cls package:package asSymbol.
+                ].
+            ].
+            cat ~= cls category ifTrue:[
+                cls withoutUpdatingChangesDo:[
+                    cls category:cat.
+                ].
+            ].
+        ].
     ].
     ^ cls.
 
     "Created: / 05-11-1998 / 15:10:25 / cg"
     "Modified: / 16-01-2007 / 12:56:18 / cg"
+
 !
 
 installAutoloadedClasses
@@ -7108,5 +7114,5 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.852 2008-09-06 11:13:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.853 2008-09-19 10:43:10 stefan Exp $'
 ! !