--- a/PositionableStream.st	Fri Jan 31 12:57:01 1997 +0100
+++ b/PositionableStream.st	Fri Jan 31 14:29:51 1997 +0100
@@ -409,37 +409,43 @@
      return the value of the last chunk.
      Someone (which is usually some codeView) is notified of errors."
 
-    |lastValue queries pkg spc spaces|
+    |lastValue queries pkg spc spaces
+     packageQuerySignal nameSpaceQuerySignal usedNameSpaceQuerySignal
+     methodRedefinitionSignal|
 
-    queries := SignalSet with:(Class packageQuerySignal)
-                         with:(Class nameSpaceQuerySignal)
-                         with:(Class usedNameSpaceQuerySignal).
+    packageQuerySignal := Class packageQuerySignal.
+    nameSpaceQuerySignal := Class nameSpaceQuerySignal.
+    usedNameSpaceQuerySignal := Class usedNameSpaceQuerySignal.
+
+    queries := SignalSet with:packageQuerySignal
+                         with:nameSpaceQuerySignal
+                         with:usedNameSpaceQuerySignal.
 
     queries handle:[:ex |
-        ex signal == Class packageQuerySignal ifTrue:[
+        ex signal == packageQuerySignal ifTrue:[
             pkg isNil ifTrue:[
                 (someone respondsTo:#packageToInstall) ifFalse:[
-                    pkg := Class packageQuerySignal raise.
+                    pkg := packageQuerySignal raise.
                 ] ifTrue:[
                     pkg := someone packageToInstall
                 ].
             ].
             ex proceedWith:pkg
         ].
-        ex signal == Class nameSpaceQuerySignal ifTrue:[
+        ex signal == nameSpaceQuerySignal ifTrue:[
             spc isNil ifTrue:[
                 (someone respondsTo:#currentNameSpace) ifFalse:[
-                    spc := Class nameSpaceQuerySignal raise.
+                    spc := nameSpaceQuerySignal raise.
                 ] ifTrue:[
                     spc := someone currentNameSpace
                 ].
             ].
             ex proceedWith:spc
         ].
-        ex signal == Class usedNameSpaceQuerySignal ifTrue:[
+        ex signal == usedNameSpaceQuerySignal ifTrue:[
             spaces isNil ifTrue:[
                 (someone respondsTo:#usedNameSpaces) ifFalse:[
-                    spaces := Class usedNameSpaceQuerySignal raise.
+                    spaces := usedNameSpaceQuerySignal raise.
                 ] ifTrue:[
                     spaces := someone usedNameSpaces
                 ].
@@ -447,6 +453,10 @@
             ex proceedWith:spaces
         ].
     ] do:[
+        |methodRedefinitionSignal|
+
+        methodRedefinitionSignal := Class methodRedefinitionSignal.
+
         "
          catch any errors during fileIn 
          - offer debug/abort/continue choice
@@ -455,7 +465,7 @@
             |action what sender msg param oldPackage newPackage|
 
             "/ for your convenience ...
-            ex signal == Class methodRedefinitionSignal ifTrue:[
+            ex signal == methodRedefinitionSignal ifTrue:[
                 param := ex parameter. "/ an association: oldMethod -> newMethod
                 oldPackage := param key package.
                 newPackage := param value package.
@@ -470,8 +480,8 @@
                 what := ex signal notifierString.
             ].
 
-            "handle the case where no GUI has been built in,
-             just abort the fileIn with a notification"
+            "/ handle the case where no GUI has been built in,
+            "/ just abort the fileIn with a notification
 
             Display isNil ifTrue:[
                 sender := ex suspendedContext sender.
@@ -481,8 +491,8 @@
                 ex return
             ].
 
-            "otherwise ask what should be done now and either
-             continue or abort the fileIn"
+            "/ otherwise ask what should be done now and either
+            "/ continue or abort the fileIn
 
             action := self askForDebug:(msg bindWith:what) withCRs.
             action == #continue ifTrue:[
@@ -491,7 +501,6 @@
             action == #abort ifTrue:[
                 ex return
             ].
-"/        Debugger enter:ex suspendedContext
             (ex signal) enterDebuggerWith:ex message:what.
             ex reject
         ] do:[
@@ -695,6 +704,6 @@
 !PositionableStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.53 1997-01-11 18:16:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.54 1997-01-31 13:29:51 cg Exp $'
 ! !
 PositionableStream initialize!