--- a/Tools__TextDiff2Tool.st	Sun Jun 28 03:54:27 2015 +0000
+++ b/Tools__TextDiff2Tool.st	Tue Jun 30 08:18:39 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -461,12 +463,16 @@
 update:something with:aParameter from:changedObject
     "Invoked when an object that I depend upon sends a change notification."
 
+    |realDiffView|
+
     (changedObject == showDiffHolder) ifTrue:[
         self updateViews.            
         ^ self.
     ].
     diffView notNil ifTrue:[
-        (diffView respondsTo:#leftTextView) ifTrue:[
+        "/ otherwise, respondsTo does not work.
+        realDiffView := diffView scrolledView.
+        (realDiffView respondsTo:#leftTextView) ifTrue:[
             ((changedObject == diffView leftTextView modifiedChannel) 
             or:[changedObject == diffView rightTextView modifiedChannel]) ifTrue:[
                 self enqueueMessage:#updateDiffFromChangedText for:self arguments:#().
@@ -502,8 +508,8 @@
     prevCursorCol2 := rightView cursorCol.
 
         
-    self textAHolder value:(leftView contents).
-    self textBHolder value:(rightView contents).
+    self textA:(leftView contents).
+    self textB:(rightView contents).
     leftView modifiedChannel setValue:false.
     rightView modifiedChannel setValue:false.
 
@@ -515,8 +521,8 @@
 updateViews
     | a b |
 
-    a := self textAHolder value.
-    b := self textBHolder value.
+    a := self textA.
+    b := self textB.
 
     self showDiffHolder value ifFalse:[
         self showTextOnly.
@@ -553,13 +559,17 @@
 !
 
 postBuildDiffView:aScrollableView
+    |textA textB|
 
     super postBuildDiffView:aScrollableView.
+
     diffView notNil ifTrue:[
-       (self textAHolder value notNil and:[self textBHolder value notNil]) ifTrue:[
+        textA := self textA.
+        textB := self textB.
+       (textA notNil and:[textB notNil]) ifTrue:[
             diffView scrolledView
-                text1: self textAHolder value
-                text2: self textBHolder value
+                text1: textA
+                text2: textB
         ].
         diffView textViews do:[:each | each modifiedChannel addDependent:self].    
     ].
@@ -587,8 +597,8 @@
     diffView isNil ifTrue:[^self].
     (scrolledView := diffView scrolledView) isNil ifTrue:[^self].
     scrolledView
-        text1: self textAHolder value
-        text2: self textBHolder value
+        text1: self textA
+        text2: self textB
 
     "Created: / 19-07-2011 / 10:22:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 18-11-2011 / 15:01:12 / cg"
@@ -634,11 +644,11 @@
 !TextDiff2Tool class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextDiff2Tool.st,v 1.5 2015-02-25 16:15:39 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Id: Tools__TextDiff2Tool.st,v 1.5 2015-02-25 16:15:39 cg Exp $'
+    ^ '$Id$'
 !
 
 version_HG
@@ -647,6 +657,6 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__TextDiff2Tool.st,v 1.5 2015-02-25 16:15:39 cg Exp $'
+    ^ '$Id$'
 ! !