--- a/Smalltalk.st	Fri Mar 01 16:33:13 2002 +0100
+++ b/Smalltalk.st	Mon Mar 04 10:23:20 2002 +0100
@@ -1888,11 +1888,18 @@
      2 entries: 1st: collection consisting of matching names
                 2nd: the best (longest) match"
 
-    |searchName matches ignCaseMatches best isMatchString cls|
-
-    searchName := aPartialClassName.
-    searchName isEmpty ifTrue:[
-        ^ Array with:searchName with:#()
+    |searchName matches ignCaseMatches best isMatchString cls nsPrefix |
+
+    aPartialClassName isEmpty ifTrue:[
+        ^ Array with:aPartialClassName with:#()
+    ].
+
+    (aPartialClassName startsWith:'Smalltalk::') ifTrue:[
+        nsPrefix := 'Smalltalk::'.
+        searchName := aPartialClassName copyFrom:'Smalltalk::' size + 1
+    ] ifFalse:[
+        nsPrefix := ''.
+        searchName := aPartialClassName.
     ].
 
     (searchName at:1) isLowercase ifTrue:[
@@ -1914,7 +1921,7 @@
                 addIt := className startsWith:searchName
             ].
             addIt ifTrue:[
-                matches add:aClass name
+                matches add:(nsPrefix , aClass name)
             ] ifFalse:[
                 "/ try ignoring case
                 isMatchString ifTrue:[
@@ -1923,7 +1930,7 @@
                     addIt := className asLowercase startsWith:searchName asLowercase
                 ].
                 addIt ifTrue:[
-                    ignCaseMatches add:aClass name
+                    ignCaseMatches add:(nsPrefix , aClass name)
                 ]
             ]
         ]
@@ -6139,5 +6146,5 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.522 2002-02-26 13:00:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.523 2002-03-04 09:23:20 cg Exp $'
 ! !