--- a/DebugView.st	Thu May 21 13:47:18 2015 +0100
+++ b/DebugView.st	Fri May 22 06:42:14 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
@@ -8708,41 +8710,46 @@
 updateContextInfoFor:aContext
     "additional info as-per selected context;
      for now:
-	update:with:from: - show who was responsible
+        update:with:from: - show who was responsible
     "
 
     |whatChanged changedObject receiver|
 
     aContext selector == #'update:with:from:' ifTrue:[
-	receiver := aContext receiver.
-	whatChanged := aContext argAt:1.
-	changedObject := aContext argAt:3.
-
-	changedObject isBehavior ifTrue:[
-	    contextInfoLabel label:('update (',whatChanged printString allBold,') triggered by ',changedObject name allBold).
-	    ^ self
-	].
-
-	receiver class allInstanceVariableNames keysAndValuesDo:[:i :nm |
-	    (receiver instVarAt:i) == changedObject ifTrue:[
-		contextInfoLabel label:('update (',whatChanged printString allBold,') triggered by ',nm allBold).
-		^ self
-	    ]
-	].
-
-	(receiver isKindOf:ApplicationModel) ifTrue:[
-	    receiver builder notNil ifTrue:[
-		(receiver builder bindings ? #()) keysAndValuesDo:[:eachAspect :eachValue |
-		    eachValue == changedObject ifTrue:[
-			contextInfoLabel label:('update (',whatChanged printString allBold,') triggered by aspect ',eachAspect allBold).
-			^ self
-		    ]
-		]
-	    ]
-	].
-
-	contextInfoLabel label:('update (',whatChanged printString allBold,') triggered by ',changedObject classNameWithArticle allBold).
-	^self.
+        receiver := aContext receiver.
+        whatChanged := aContext argAt:1.
+        changedObject := aContext argAt:3.
+
+        changedObject isBehavior ifTrue:[
+            contextInfoLabel label:('update (',whatChanged printString allBold,') triggered by ',changedObject name allBold).
+            ^ self
+        ].
+
+        receiver class allInstanceVariableNames keysAndValuesDo:[:i :nm |
+            |val|
+
+            IsDebuggingQuery answer:true do:[    
+                val := (receiver instVarAt:i).
+            ].
+            val == changedObject ifTrue:[
+                contextInfoLabel label:('update (',whatChanged printString allBold,') triggered by ',nm allBold).
+                ^ self
+            ]
+        ].
+
+        (receiver isKindOf:ApplicationModel) ifTrue:[
+            receiver builder notNil ifTrue:[
+                (receiver builder bindings ? #()) keysAndValuesDo:[:eachAspect :eachValue |
+                    eachValue == changedObject ifTrue:[
+                        contextInfoLabel label:('update (',whatChanged printString allBold,') triggered by aspect ',eachAspect allBold).
+                        ^ self
+                    ]
+                ]
+            ]
+        ].
+
+        contextInfoLabel label:('update (',whatChanged printString allBold,') triggered by ',changedObject classNameWithArticle allBold).
+        ^self.
     ].
     contextInfoLabel label:nil.
 !
@@ -9532,15 +9539,15 @@
 !DebugView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.689 2015-03-02 13:39:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.690 2015-05-21 10:47:18 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.689 2015-03-02 13:39:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.690 2015-05-21 10:47:18 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: DebugView.st,v 1.689 2015-03-02 13:39:16 cg Exp $'
+    ^ '$Id: DebugView.st,v 1.690 2015-05-21 10:47:18 cg Exp $'
 ! !