equal
deleted
inserted
replaced
418 line1 := line2 := nil. |
418 line1 := line2 := nil. |
419 (entry at:1) == $< ifTrue:[ |
419 (entry at:1) == $< ifTrue:[ |
420 useColors ifTrue:[ |
420 useColors ifTrue:[ |
421 (l2 size >= idx1 |
421 (l2 size >= idx1 |
422 and:[(s2 := line2 := l2 at:idx1) notNil |
422 and:[(s2 := line2 := l2 at:idx1) notNil |
423 and:[(s2 asString string withoutSeparators = (text1 at:idx1) string withoutSeparators) |
423 and:[(line2 asString string withoutSeparators = (line1 := text1 at:idx1) asString string withoutSeparators) |
424 "/ or:[(s2 asString withoutSeparators withTabsExpanded = (text1 at:idx1) withoutSeparators withTabsExpanded)] |
424 "/ or:[(s2 asString withoutSeparators withTabsExpanded = (text1 at:idx1) withoutSeparators withTabsExpanded)] |
425 ]]) ifTrue:[ |
425 ]]) ifTrue:[ |
426 line1 := Text string:(text1 at:idx1) |
426 line1 := Text string:line1 |
427 foregroundColor:changedSpacesOnlyColor |
427 foregroundColor:changedSpacesOnlyColor |
428 backgroundColor:changedSpacesOnlyBgColor. |
428 backgroundColor:changedSpacesOnlyBgColor. |
429 line2 := Text string:line2 asString |
429 line2 := Text string:line2 asString |
430 foregroundColor:changedSpacesOnlyColor |
430 foregroundColor:changedSpacesOnlyColor |
431 backgroundColor:changedSpacesOnlyBgColor. |
431 backgroundColor:changedSpacesOnlyBgColor. |
581 ! ! |
581 ! ! |
582 |
582 |
583 !DiffTextView class methodsFor:'documentation'! |
583 !DiffTextView class methodsFor:'documentation'! |
584 |
584 |
585 version |
585 version |
586 ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.57 2013-02-01 15:13:02 cg Exp $' |
586 ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.58 2013-03-11 11:51:45 cg Exp $' |
587 ! |
587 ! |
588 |
588 |
589 version_CVS |
589 version_CVS |
590 ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.57 2013-02-01 15:13:02 cg Exp $' |
590 ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.58 2013-03-11 11:51:45 cg Exp $' |
591 ! ! |
591 ! ! |
592 |
592 |