--- a/DiffTextView.st	Fri Jun 21 16:41:14 2002 +0200
+++ b/DiffTextView.st	Fri Jun 21 16:41:56 2002 +0200
@@ -195,8 +195,8 @@
     "set the two texts which are to be diffed;
      execute DiffCommand and update the two textViews."
 
-    |tmpFile1 tmpFile2 name1 tmpName2 stream line 
-     text1 text2 diffList pidString diffTemplate diffCmd|
+    |tmpFile1 tmpFile2  stream line 
+     text1 text2 diffList  diffTemplate diffCmd|
 
     text1 := t1 asStringCollection.
     text2 := t2 asStringCollection.
@@ -212,6 +212,7 @@
         stream := tmpFile1 writeStream.
         text1 do:[:line |
             line notNil ifTrue:[
+(line includes:Character return) ifTrue: [self halt].
                 stream nextPutAll:line.
             ].
             stream cr
@@ -222,6 +223,7 @@
         stream := tmpFile2 writeStream.
         text2 do:[:line |
             line notNil ifTrue:[
+(line includes:Character return) ifTrue: [self halt].
                 stream nextPutAll:line.
             ].
             stream cr
@@ -618,5 +620,5 @@
 !DiffTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.33 2001-07-19 14:12:01 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.34 2002-06-21 14:41:41 cg Exp $'
 ! !