--- a/ChangeSetBrowser.st	Mon Mar 13 17:02:45 2006 +0100
+++ b/ChangeSetBrowser.st	Mon Mar 13 17:03:08 2006 +0100
@@ -719,23 +719,32 @@
 applyPossiblyModifiedChange:aChange
     |ns superClass superClassName|
 
-    applyInOriginalNameSpace value ifFalse:[
-        aChange isClassDefinitionChange ifTrue:[
-            superClassName := aChange superClassName.
-
-            ns := Class nameSpaceQuerySignal query.
-            superClass := ns at:superClassName.
-            (superClass isNil and:[ superClass ~~ Smalltalk ]) ifTrue:[
+    aChange isClassDefinitionChange ifTrue:[
+        superClassName := aChange superClassName.
+        superClassName notNil ifTrue:[
+            superClassName := superClassName asSymbol.
+            applyInOriginalNameSpace value ifFalse:[
+                ns := Class nameSpaceQuerySignal query.
+                superClass := ns at:superClassName.
+                (superClass isNil and:[ superClass ~~ Smalltalk ]) ifTrue:[
+                    superClass := Smalltalk at:superClassName.
+                ].
+            ] ifTrue:[
                 superClass := Smalltalk at:superClassName.
             ].
             superClass isNil ifTrue:[
-                (superClassName includes:$:) ifFalse:[
-                    superClass := ns at:superClassName.
-                ].
+                |guess|
+                guess := SystemBrowser classesWithNameSimilarTo:superClassName.
+                guess notEmptyOrNil ifTrue:[ guess := guess first ] ifFalse:[ guess := nil ].
+                superClass := Dialog 
+                                requestClass:'No superclass: ', superClassName allBold , ' enter a replacement:' 
+                                initialAnswer:(guess ? superClassName).  
+                superClass isNil ifTrue:[^ self ].
             ].
+            
             superClass notNil ifTrue:[
                 aChange superClassName:superClass name.
-            ]
+            ].
         ].
     ].
 
@@ -979,5 +988,5 @@
 !ChangeSetBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.42 2006-03-06 08:53:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.43 2006-03-13 16:03:08 cg Exp $'
 ! !