--- a/GenericException.st	Tue Jun 18 08:52:59 2002 +0200
+++ b/GenericException.st	Tue Jun 18 12:01:58 2002 +0200
@@ -1238,11 +1238,11 @@
       ]
 
     "test with (try a few halts or CTRL-C's):
-     NoHandlerError emergencyHandler:(Exception mailingEmergencyHandler)
+     NoHandlerError emergencyHandler:(NoHandlerError mailingEmergencyHandler)
     "
 
     "back with:
-     NoHandlerError emergencyHandler:(Exception notifyingEmergencyHandler)
+     NoHandlerError emergencyHandler:(NoHandlerError notifyingEmergencyHandler)
      NoHandlerError emergencyHandler:nil
     "
 
@@ -1261,7 +1261,7 @@
 
     ^ [:ex | 
         (ex signal == NoHandlerError 
-        and:[ex parameter class inheritsFrom:ControlInterrupt]) ifTrue:[
+        and:[ex parameter signal inheritsFrom:ControlInterrupt]) ifTrue:[
             "/ go directly into the debugger ...
             Debugger 
                 enter:ex suspendedContext 
@@ -1276,8 +1276,9 @@
         ]
       ]
 
-    "test with (try a few halts or CTRL-C's):
-     Exception emergencyHandler:(Exception notifyingEmergencyHandler)
+    "test with (NOTE: halt, breakpoints or CTRL-C's still go straight into the debugger):
+     NoHandlerError emergencyHandler:(NoHandlerError notifyingEmergencyHandler).
+     Object bla.
     "
 
     "back with:
@@ -1312,7 +1313,7 @@
             AbortSignal raise.
         ] ifFalse:[
             (ex signal == NoHandlerError 
-            and:[ex parameter class inheritsFrom:ControlInterrupt]) ifTrue:[
+            and:[ex parameter signal inheritsFrom:ControlInterrupt]) ifTrue:[
                 "/ go directly into the debugger ...
                 Debugger 
                     enter:ex suspendedContext 
@@ -1328,8 +1329,9 @@
         ]
       ]
 
-    "test with (try a few halts or CTRL-C's):
-     Exception emergencyHandler:(Exception notifyingEmergencyHandlerForUserProcesses)
+    "test with:
+     NoHandlerError emergencyHandler:(NoHandlerError notifyingEmergencyHandlerForUserProcesses)
+     Object bla.
     "
 
     "back with:
@@ -2269,6 +2271,6 @@
 !GenericException class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.65 2002-05-02 08:45:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.66 2002-06-18 10:01:58 stefan Exp $'
 ! !
 GenericException initialize!