--- a/DiffTextView.st Sat Mar 20 16:01:48 2004 +0100
+++ b/DiffTextView.st Sat Mar 20 16:02:50 2004 +0100
@@ -218,7 +218,7 @@
stream := tmpFile1 writeStream.
text1 do:[:line |
line notNil ifTrue:[
-(line includes:Character return) ifTrue: [self halt].
+(line includes:Character return) ifTrue: [self halt:'oops - funny line'].
stream nextPutAll:line.
].
stream cr
@@ -229,7 +229,7 @@
stream := tmpFile2 writeStream.
text2 do:[:line |
line notNil ifTrue:[
-(line includes:Character return) ifTrue: [self halt].
+(line includes:Character return) ifTrue: [self halt:'oops - funny line'].
stream nextPutAll:line.
].
stream cr
@@ -245,8 +245,8 @@
stream := PipeStream readingFrom:diffCmd.
stream isNil ifTrue:[
- stream := PipeStream readingFrom:('support' , Filename separator asString , diffCmd).
- ].
+ stream := PipeStream readingFrom:('support' , Filename separator , diffCmd).
+ ].
stream isNil ifTrue:[
self error:'cannot execute diff'.
text1 := text2 := nil.
@@ -632,5 +632,5 @@
!DiffTextView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.37 2003-01-27 12:07:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.38 2004-03-20 15:02:50 cg Exp $'
! !