| ︙ | | |
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
-
+
|
# Stop Tk from meddling with the command line by copying it first.
set ::eskil(argv) $::argv
set ::eskil(argc) $::argc
set ::argv {}
set ::argc 0
set ::eskil(debug) 0
set ::eskil(diffver) "Version 2.6.2 2012-06-18"
set ::eskil(diffver) "Version 2.6.2+ 2012-06-22"
set ::eskil(thisScript) [file join [pwd] [info script]]
namespace import tcl::mathop::+
namespace import tcl::mathop::-
namespace import tcl::mathop::*
namespace import tcl::mathop::/
|
| ︙ | | |
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
|
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
|
+
|
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 {[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} {
|
| ︙ | | |
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
|
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
|
-
+
|
Init
return [makeDiffWin]
}
set allOpts {
-w --help -help -b -noignore -i -nocase -nodigit -nokeyword -prefix
-noparse -line -smallblock -block -char -word -limit -nodiff -dir
-clip -patch -browse -conflict -print
-clip -patch -browse -conflict -print -noempty -pivot
-printHeaderSize -printCharsPerLine -printPaper
-printColorChange -printColorOld -printColorNew
-server -o -a -fine -r -context -cvs -svn -review
-foreach -preprocess -preprocessleft -preprocessright
-close -nonewline -plugin -plugininfo
-plugindump -pluginlist -nocdiff
}
|
| ︙ | | |
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
|
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
|
+
+
+
+
|
} elseif {$nextArg eq "revision"} {
set opts(doptrev$revNo) $arg
incr revNo
} elseif {$nextArg eq "limitlines"} {
set opts(limitlines) $arg
} elseif {$nextArg eq "context"} {
set Pref(context) $arg
} elseif {$nextArg eq "pivot"} {
if {$arg >= 1} {
set Pref(pivot) $arg
}
} elseif {$nextArg eq "prefix"} {
set RE [string map [list % $arg] {^.*?\m(%\w+).*$}]
if {$Pref(nocase)} {
set RE "(?i)$RE"
}
lappend ::Pref(preprocess) $RE {\1} ""
} elseif {$nextArg eq "plugin"} {
|
| ︙ | | |
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
|
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
|
-
+
+
+
|
set Pref(ignore) "-b"
} elseif {$arg eq "-noignore"} {
set Pref(ignore) " "
} elseif {$arg eq "-i"} {
set Pref(nocase) 1
} elseif {$arg eq "-nocase"} {
set Pref(nocase) 1
} elseif {$arg eq "-noempty"} {
} elseif {$arg eq "-noempty"} { # FIXA: Add to documentation
set Pref(noempty) 1
} elseif {$arg eq "-pivot"} { # FIXA: Add to documentation
set nextArg pivot
} elseif {$arg eq "-nodigit"} {
set Pref(nodigit) 1
} elseif {$arg eq "-nokeyword"} {
set Pref(dir,ignorekey) 1
} elseif {$arg eq "-prefix"} {
set nextArg prefix
} elseif {$arg eq "-preprocess"} {
|
| ︙ | | |
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
|
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
|
+
|
set Pref(fontsize) 8
# Maybe change to TkFixedFont in 8.5 ?
set Pref(fontfamily) Courier
set Pref(ignore) "-b"
set Pref(nocase) 0
set Pref(noempty) 0
set Pref(pivot) 0
set Pref(nodigit) 0
set Pref(parse) 2
set Pref(lineparsewords) 0
set Pref(colorequal) ""
set Pref(colorchange) red
set Pref(colornew1) darkgreen
set Pref(colornew2) blue
|
| ︙ | | |