--- a/BrowserView.st	Tue Jan 14 12:38:12 1997 +0100
+++ b/BrowserView.st	Tue Jan 14 12:47:17 1997 +0100
@@ -1581,14 +1581,30 @@
         codeView contents:(aStream contents).
         codeView modified:false.
         codeView acceptAction:[:theCode |
+            |ns|
+
+            currentClass notNil ifTrue:[
+                ns := currentClass nameSpace
+            ] ifFalse:[
+                ns := nil
+            ].
+        
             codeView cursor:Cursor execute.
-            Object abortSignal catch:[
-                (Compiler evaluate:theCode asString notifying:codeView compile:false)
-                isBehavior ifTrue:[
-                    codeView modified:false.
-                    self classCategoryUpdate.
-                    self updateClassListWithScroll:false.
-                ]
+
+            Class nameSpaceQuerySignal handle:[:ex |
+                ns isNil ifTrue:[
+                    ex reject
+                ].
+                ex proceedWith:ns
+            ] do:[
+                Object abortSignal catch:[
+                    (Compiler evaluate:theCode asString notifying:codeView compile:false)
+                    isBehavior ifTrue:[
+                        codeView modified:false.
+                        self classCategoryUpdate.
+                        self updateClassListWithScroll:false.
+                    ]
+                ].
             ].
             codeView cursor:Cursor normal.
         ].
@@ -1601,7 +1617,7 @@
         self normalLabel
     ]
 
-    "Modified: 4.1.1997 / 21:10:14 / cg"
+    "Modified: 14.1.1997 / 13:31:58 / cg"
 !
 
 classDocumentation
@@ -3609,22 +3625,37 @@
             self classListUpdate.
 
             codeView acceptAction:[:theCode |
+                |ns|
+
+                currentClass notNil ifTrue:[
+                    ns := currentClass nameSpace
+                ] ifFalse:[
+                    ns := nil
+                ].
+
                 codeView cursor:Cursor execute.
 
-                Object abortSignal catch:[
-                    UndefinedObject createMinimumProtocolInNewSubclassQuery
-                    answer:true
-                    do:[
-                        (Compiler 
-                            evaluate:theCode asString 
-                            notifying:codeView 
-                            compile:false)
-                        isBehavior ifTrue:[
-                            self classCategoryUpdate.
-                            self updateClassListWithScroll:false.
-                            codeView modified:false.
-                        ].
-                    ]
+                Class nameSpaceQuerySignal handle:[:ex |
+                    ns isNil ifTrue:[
+                        ex reject
+                    ].
+                    ex proceedWith:ns
+                ] do:[
+                    Object abortSignal catch:[
+                        UndefinedObject createMinimumProtocolInNewSubclassQuery
+                        answer:true
+                        do:[
+                            (Compiler 
+                                evaluate:theCode asString 
+                                notifying:codeView 
+                                compile:false)
+                            isBehavior ifTrue:[
+                                self classCategoryUpdate.
+                                self updateClassListWithScroll:false.
+                                codeView modified:false.
+                            ].
+                        ]
+                    ].
                 ].
                 codeView cursor:Cursor normal.
             ].
@@ -3642,7 +3673,7 @@
     ]
 
     "Created: 23.11.1995 / 11:32:03 / cg"
-    "Modified: 3.1.1997 / 15:46:22 / cg"
+    "Modified: 14.1.1997 / 13:33:29 / cg"
 !
 
 classTemplateFor:aSuperClass in:categoryString namespace:isNameSpace private:isPrivate
@@ -9258,6 +9289,6 @@
 !BrowserView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.254 1997-01-11 20:45:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.255 1997-01-14 11:47:17 cg Exp $'
 ! !
 BrowserView initialize!