--- a/DebugView.st	Fri Nov 16 16:12:51 2001 +0100
+++ b/DebugView.st	Fri Nov 16 16:19:52 2001 +0100
@@ -4312,20 +4312,12 @@
                 "/
                 "/ ignore recursive breakpoints
                 "/
-                (MessageTracer notNil
-                and:[MessageTracer isLoaded
-                and:[signal == MessageTracer breakpointSignal]]) ifTrue:[
-                    ignoreBreakpoints == true ifTrue:[
-                        'DebugView [info]: breakpoint in debugger ignored' infoPrintCR.
-                        ex proceed
-                    ].
-                ].
                 (signal == ActivityNotificationSignal) ifTrue:[
                     ex proceed
                 ].
-                (signal == Object haltSignal) ifTrue:[
+                (signal isControlInterrupt) ifTrue:[
                     ignoreBreakpoints == true ifTrue:[
-                        'DebugView [info]: halt in debugger ignored' infoPrintCR.
+                        'DebugView [info]: halt/break in debugger ignored' infoPrintCR.
                         ex proceed
                     ].
                 ].
@@ -4370,8 +4362,7 @@
             self topView raiseDeiconified.    
 
             eMsg := ex errorString.
-            (ex signal == MessageTracer breakpointSignal
-            or:[ex signal == Object haltSignal]) ifTrue:[
+            (ex signal isControlInterrupt) ifTrue:[
                 eMsg := eMsg , Character cr asString , 'in ' , ex suspendedContext printString
             ].
 
@@ -4407,7 +4398,7 @@
     catchBlock := nil.
 
     "Created: / 24.11.1995 / 20:33:45 / cg"
-    "Modified: / 6.2.2000 / 15:14:07 / cg"
+    "Modified: / 16.11.2001 / 16:14:44 / cg"
 ! !
 
 !DebugView methodsFor:'user interaction'!
@@ -4692,8 +4683,8 @@
     Object errorSignal handle:[:ex |
         |s con|
 
-        ex signal == Object haltSignal ifTrue:[
-            'DebugView [info]: halt ignored - while showing selection in debugger' infoPrintCR.
+        ex signal isControlInterrupt ifTrue:[
+            'DebugView [info]: halt/break ignored - while showing selection in debugger' infoPrintCR.
             ex proceed
         ].
 
@@ -4721,7 +4712,7 @@
         self doShowSelection:lineNr
     ]
 
-    "Modified: / 11.8.1998 / 20:56:45 / cg"
+    "Modified: / 16.11.2001 / 16:13:08 / cg"
 !
 
 updateForContext:lineNr
@@ -4734,8 +4725,6 @@
      codeSet highlighter evaluatorClass
      canDefine|
 
-lineNr > contextArray size ifTrue:[ thisContext fullPrintAll ].
-
     canDefine := false.
     currentMethod := nil.
 
@@ -4913,10 +4902,7 @@
                 errMsg := nil.
                 method notNil ifTrue:[
                     Object errorSignal handle:[:ex |
-                        ex signal == Object haltSignal ifTrue:[
-                            ex proceed.
-                        ].
-                        ex signal == MessageTracer breakpointSignal ifTrue:[
+                        ex signal isControlInterrupt ifTrue:[
                             ex proceed.
                         ].
                         code := 'error while asking method for its source'.
@@ -5075,7 +5061,7 @@
     self updateMenuItems
 
     "Created: / 14.8.1997 / 20:15:00 / cg"
-    "Modified: / 16.11.2001 / 15:54:49 / cg"
+    "Modified: / 16.11.2001 / 16:16:23 / cg"
 !
 
 updateMenuItems
@@ -5126,6 +5112,6 @@
 !DebugView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.294 2001-11-16 15:12:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.295 2001-11-16 15:19:52 cg Exp $'
 ! !
 DebugView initialize!