| ︙ | | |
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
|
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
|
+
+
+
|
detectLineEnd $top $::eskil($top,leftFile) lefttranslation
# Prepare Separator
set ::eskil($top,separator) \
[subst -nocommands -novariables $::eskil($top,separatorview)]
# Autodetect separator before any plugin processing
if {$::eskil($top,view) eq "table" && $::eskil($top,separator) eq ""} {
set ch1 [open $::eskil($top,leftFile)]
if {$::eskil($top,gz)} {
zlib push gunzip $ch1
}
gets $ch1 line1
close $ch1
# Any tab, comma or semicolon?
if {[regsub -all "\t" $line1 "\t" _] >= 2} {
set ::eskil($top,separator) "\t"
set ::eskil($top,separatorview) "\\t"
} elseif {[regsub -all "," $line1 "," _] >= 2} {
|
| ︙ | | |
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
|
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
|
+
|
wm title $top "Eskil: [TitleTail $top]"
# Run diff and parse the result.
set opts $::Pref(ignore)
if {$::Pref(nocase)} {lappend opts -nocase}
if {$::Pref(noempty)} {lappend opts -noempty}
if {$::Pref(pivot) > 0} {lappend opts -pivot $::Pref(pivot)}
if {$::eskil($top,gz)} {lappend opts -gz}
if {[info exists ::eskil($top,aligns)] && \
[llength $::eskil($top,aligns)] > 0} {
lappend opts -align $::eskil($top,aligns)
}
set range {}
if {[info exists ::eskil($top,range)] && \
[llength $::eskil($top,range)] == 4} {
|
| ︙ | | |
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
|
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
|
+
+
+
+
+
|
collectAncestorInfo $top $dFile1 $dFile2 $opts
}
set firstview 1
set ch1 [open $::eskil($top,leftFile)]
set ch2 [open $::eskil($top,rightFile)]
if {$::eskil($top,gz)} {
disallowEdit $top
zlib push gunzip $ch1
zlib push gunzip $ch2
}
set doingLine1 1
set doingLine2 1
if {$::eskil($top,view) eq "table"} {
# Look for table header line
set i [lindex $diffres 0]
lassign $i line1 n1 line2 n2
|
| ︙ | | |
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
|
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
|
+
|
set ::eskil($top,printFile) ""
set ::eskil($top,mergeFile) ""
set ::eskil($top,ancestorFile) ""
set ::eskil($top,separator) ""
set ::eskil($top,separatorview) ""
set ::eskil($top,conflictFile) ""
set ::eskil($top,limitlines) 0
set ::eskil($top,gz) 0
set ::eskil($top,maxwidth) 0
set ::eskil($top,plugin) ""
# Copy the collected options from command line
foreach {item val} $::eskil(defaultopts) {
set ::eskil($top,$item) $val
}
|
| ︙ | | |