--- a/Tools__TextDiffTool.st	Fri Jul 27 22:45:44 2012 +0200
+++ b/Tools__TextDiffTool.st	Fri Jul 27 23:48:04 2012 +0200
@@ -626,17 +626,27 @@
     "return/create the 'codeAspectHolder' value holder (automatically generated)"
 
     codeAspectHolder isNil ifTrue:[
-        codeAspectHolder := ValueHolder with: #expression.
+        codeAspectHolder := ValueHolder with: (SyntaxHighlighter codeAspectExpression).
+        codeAspectHolder addDependent:self
     ].
     ^ codeAspectHolder
 
     "Modified: / 19-07-2011 / 19:07:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 27-07-2012 / 23:46:11 / cg"
 !
 
 codeAspectHolder:something
     "set the 'codeAspectHolder' value holder (automatically generated)"
 
+    codeAspectHolder notNil ifTrue:[
+        codeAspectHolder removeDependent:self
+    ].
     codeAspectHolder := something.
+    codeAspectHolder notNil ifTrue:[
+        codeAspectHolder addDependent:self
+    ].
+
+    "Modified: / 27-07-2012 / 22:55:42 / cg"
 !
 
 diffSpecHolder
@@ -870,7 +880,6 @@
 update:something with:aParameter from:changedObject
     "Invoked when an object that I depend upon sends a change notification."
 
-
     changedObject == textAHolder ifTrue:[
         textAChanged := true.
         self updateAfterAorBChanged.
@@ -881,7 +890,12 @@
         self updateAfterAorBChanged.
         ^ self.
     ].
-
+    changedObject == codeAspectHolder ifTrue:[
+        (codeView notNil and:[codeView scrolledView notNil ]) ifTrue:[codeView scrolledView codeAspect: codeAspectHolder value].
+        (diffView notNil and:[diffView scrolledView notNil ]) ifTrue:[diffView scrolledView codeAspect: codeAspectHolder value].
+        self updateViews.            
+        ^ self.
+    ].
     (changedObject == showDiffHolder) ifTrue:[
         self updateViews.            
         ^self.
@@ -889,21 +903,22 @@
     super update:something with:aParameter from:changedObject
 
     "Modified: / 19-07-2011 / 19:44:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 27-07-2012 / 23:44:32 / cg"
 !
 
 updateAfterAorBChanged
-
     (textAChanged & textBChanged) ifTrue:[
         textAChanged := textBChanged := false.
         self updateViews
     ].
 
     "Created: / 06-07-2011 / 12:12:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 27-07-2012 / 23:00:28 / cg"
 !
 
 updateViews
+    | a b |
 
-    | a b |
     a := self textAHolder value.
     b := self textBHolder value.
 
@@ -928,6 +943,7 @@
    self showNothing.
 
     "Created: / 19-07-2011 / 11:29:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 27-07-2012 / 23:00:32 / cg"
 ! !
 
 !TextDiffTool methodsFor:'hooks'!
@@ -977,12 +993,13 @@
     
     diffView isNil ifTrue:[^self].
     (scrolledView := diffView scrolledView) isNil ifTrue:[^self].
+    scrolledView codeAspect: codeAspectHolder value.
     scrolledView
         text1: self textAHolder value
         text2: self textBHolder value
 
     "Created: / 19-07-2011 / 10:22:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 18-11-2011 / 15:01:12 / cg"
+    "Modified: / 27-07-2012 / 23:31:04 / cg"
 !
 
 showNothing
@@ -1016,11 +1033,11 @@
 !TextDiffTool class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.7 2012-07-27 19:58:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.8 2012-07-27 21:48:04 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.7 2012-07-27 19:58:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiffTool.st,v 1.8 2012-07-27 21:48:04 cg Exp $'
 !
 
 version_SVN