···

       
1
       
-
       
Index: tkdiff

     

       
2
       
-
       
===================================================================

     

       
3
       
-
       
diff --git a/tkdiff b/tkdiff

     

       
4
       
-
       
--- a/tkdiff	(revision 188)

     

       
5
       
-
       
+++ b/tkdiff	(revision 189)

     

       
6
       
-
       
@@ -111,7 +111,7 @@

     

       
7
       
-
       
 }

     

       
8
       
-
       
 

     

       
9
       
-
       
 # Determine the name of the temporary directory, the rc file name,

     

       
10
       
-
       
-# and possible VPATH EnvVar, all of which are platform dependent.

     

       
11
       
-
       
+# NULLdev, and possible VPATH EnvVar, all of which are platform dependent.

     

       
12
       
-
       
 #

     

       
13
       
-
       
 # Much MAY likely be overridden by a preference in .tkdiffrc,

     

       
14
       
-
       
 # EXCEPT (obviously) when no such file actually exists yet

     

       
15
       
-
       
@@ -126,6 +126,9 @@

     

       
16
       
-
       
             set opts(tmpdir) C:/temp

     

       
17
       
-
       
         }

     

       
18
       
-
       
 

     

       
19
       
-
       
+        # Reserved filename which is actually a NULL device

     

       
20
       
-
       
+        set opts(NULLdev) "nul"

     

       
21
       
-
       
+

     

       
22
       
-
       
         # Split up and store a VPATH if it exists

     

       
23
       
-
       
         if {[info exists ::env(VPATH)]} {

     

       
24
       
-
       
             set finfo(Vpath) [split $::env(VPATH) ";"]

     

       
25
       
-
       
@@ -145,6 +148,9 @@

     

       
26
       
-
       
             set opts(tmpdir) $::env(TMPDIR)

     

       
27
       
-
       
         }  {set opts(tmpdir) /tmp }

     

       
28
       
-
       
 

     

       
29
       
-
       
+        # Reserved filename which is actually a NULL device (Unix-like platforms)

     

       
30
       
-
       
+        set opts(NULLdev) "/dev/null"

     

       
31
       
-
       
+

     

       
32
       
-
       
         # Split up and store a VPATH if it exists

     

       
33
       
-
       
         if {[info exists ::env(VPATH)]} {

     

       
34
       
-
       
             set finfo(Vpath) [split $::env(VPATH) ":"]

     

       
35
       
-
       
@@ -2106,7 +2112,7 @@

     

       
36
       
-
       
 #           1  Failed   (PLUS a 'pushed' HARD-error message to the caller)

     

       
37
       
-
       
 ###############################################################################

     

       
38
       
-
       
 proc get-file {fn ndx {probe 0}} {

     

       
39
       
-
       
-    global g finfo

     

       
40
       
-
       
+    global g opts finfo

     

       
41
       
-
       
 

     

       
42
       
-
       
     # Ancestor files are stored into a slightly adjusted array element name 

     

       
43
       
-
       
     #   N.B> 'ndx' AS PASSED *can* be an EXPRESSION (not just a number): resolve!

     

       
44
       
-
       
@@ -2121,7 +2127,7 @@

     

       
45
       
-
       
     } elseif {!$tildechk} {

     

       
46
       
-
       
         # DO NOT REPORT non-existence if this attempt was ONLY a probe

     

       
47
       
-
       
         if {$probe} { return 1 } { set MSG "File '$fn' does not exist" }

     

       
48
       
-
       
-    } elseif {[file isfile $fn]} {

     

       
49
       
-
       
+    } elseif {[file isfile $fn] || $fn == $opts(NULLdev)} {

     

       
50
       
-
       
         set finfo(${A}lbl,$ndx) [shortNm [set finfo(${A}pth,$ndx) "$fn"]]

     

       
51
       
-
       
     } else { set MSG "'$fn' exists, but is not a file" }

     

       
52
       
-
       
 

     

       
53
       
-
       
@@ -2857,7 +2863,7 @@

     

       
54
       
-
       
 # Align various label decorations to the CURRENT input file pairing

     

       
55
       
-
       
 ###############################################################################

     

       
56
       
-
       
 proc alignDecor {pairnum} {

     

       
57
       
-
       
-    global g w finfo

     

       
58
       
-
       
+    global g w opts finfo

     

       
59
       
-
       
 

     

       
60
       
-
       
     # Establish if 3way mode is NOW active and what file indices are in use

     

       
61
       
-
       
     set g(is3way) [info exists finfo(albl,$pairnum)]

     

       
62
       
-
       
@@ -2874,7 +2880,8 @@

     

       
63
       
-
       
             set finfo(lbl,$LR) $finfo(ulbl,$ndx($n))    ;# Override lbl display

     

       
64
       
-
       
         } else {set finfo(lbl,$LR) $finfo(lbl,$ndx($n))}

     

       
65
       
-
       
 

     

       
66
       
-
       
-        if {![info exists finfo(tmp,$ndx($n))]} {

     

       
67
       
-
       
+        if {![info exists finfo(tmp,$ndx($n))] \

     

       
68
       
-
       
+            && $finfo(pth,$ndx($n)) != $opts(NULLdev)} {

     

       
69
       
-
       
             #   (N.B> Tip data will ALSO be used by report generation heading)

     

       
70
       
-
       
             set    g(tooltip,${LR}Label) "{$finfo(pth,$ndx($n))\n"

     

       
71
       
-
       
             append g(tooltip,${LR}Label) \

     

···

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

···

       
1
       
-
       
Index: tkdiff

     

       
2
       
-
       
===================================================================

     

       
3
       
-
       
diff --git a/tkdiff b/tkdiff

     

       
4
       
-
       
--- a/tkdiff	(revision 193)

     

       
5
       
-
       
+++ b/tkdiff	(revision 194)

     

       
6
       
-
       
@@ -4557,7 +4557,8 @@

     

       
7
       
-
       
                 }

     

       
8
       
-
       
             }

     

       
9
       
-
       
         }

     

       
10
       
-
       
-    }

     

       
11
       
-
       
+        # But KICK scroll to *LOOK* for Ratcliff (when ON); otherwise is a NOOP

     

       
12
       
-
       
+    } { $w(acTxWdg) SEE @1,1 }

     

       
13
       
-
       
 }

     

       
14
       
-
       
 

     

       
15
       
-
       
 ###############################################################################

     

···

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

···

       
2
       
 
       


     

       
3
       
 
       
stdenv.mkDerivation (finalAttrs: {

     

       
4
       
 
       
  pname = "tkdiff";

     

       
5
       
-
       
  version = "5.6";

     

       
6
       
 
       


     

       
7
       
 
       
  src = fetchzip {

     

       
8
       
 
       
    url = "mirror://sourceforge/tkdiff/tkdiff-${builtins.replaceStrings ["."] ["-"] finalAttrs.version}.zip";

     

       
9
       
-
       
    hash = "sha256-EpbIdjsejkkTaSpoZRM5AHz0r1Cio+YzRryK0BoghBk=";

     

       
10
       
 
       
  };

     

       
11
       
-
       


     

       
12
       
-
       
  patches = [

     

       
13
       
-
       
    # fix regression: allow /dev/null again. eg: "tkdiff /dev/null file"

     

       
14
       
-
       
    # svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk

     

       
15
       
-
       
    ./189.patch

     

       
16
       
-
       


     

       
17
       
-
       
    # fix regression: trigger redraw when inline recursive diff requested

     

       
18
       
-
       
    # svn diff --git -r193:194 https://svn.code.sf.net/p/tkdiff/code/trunk | \

     

       
19
       
-
       
    #   sed -e '/^@@ -4545,7/,14d' -e '/^@@ -18063,7/,$d'

     

       
20
       
-
       
    ./194.patch

     

       
21
       
-
       
  ];

     

       
22
       
 
       


     

       
23
       
 
       
  nativeBuildInputs = [ makeBinaryWrapper ];

     

       
24
       
 
       


     

···

       
2
       
 
       


     

       
3
       
 
       
stdenv.mkDerivation (finalAttrs: {

     

       
4
       
 
       
  pname = "tkdiff";

     

       
5
       
+
       
  version = "5.7";

     

       
6
       
 
       


     

       
7
       
 
       
  src = fetchzip {

     

       
8
       
 
       
    url = "mirror://sourceforge/tkdiff/tkdiff-${builtins.replaceStrings ["."] ["-"] finalAttrs.version}.zip";

     

       
9
       
+
       
    hash = "sha256-ZndpolvaXoCAzR4KF+Bu7DJrXyB/C2H2lWp5FyzOc4M=";

     

       
10
       
 
       
  };

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
11
       
 
       


     

       
12
       
 
       
  nativeBuildInputs = [ makeBinaryWrapper ];

     

       
13