From 3d8ba076a53fa8738c5fe25f565d9eccaf36228c Mon Sep 17 00:00:00 2001
From: Rob <86313040+robert-manchester@users.noreply.github.com>
Date: Tue, 31 Oct 2023 00:36:22 -0700
Subject: [PATCH] tkdiff: patch to trigger recursive inline diffs

add patch to fix regression to trigger recursive inline diffs when
selected
---
 pkgs/by-name/tk/tkdiff/194.patch   | 15 +++++++++++++++
 pkgs/by-name/tk/tkdiff/package.nix | 13 ++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/tk/tkdiff/194.patch

diff --git a/pkgs/by-name/tk/tkdiff/194.patch b/pkgs/by-name/tk/tkdiff/194.patch
new file mode 100644
index 000000000000..0fc50db3028b
--- /dev/null
+++ b/pkgs/by-name/tk/tkdiff/194.patch
@@ -0,0 +1,15 @@
+Index: tkdiff
+===================================================================
+diff --git a/tkdiff b/tkdiff
+--- a/tkdiff	(revision 193)
++++ b/tkdiff	(revision 194)
+@@ -4557,7 +4557,8 @@
+                 }
+             }
+         }
+-    }
++        # But KICK scroll to *LOOK* for Ratcliff (when ON); otherwise is a NOOP
++    } { $w(acTxWdg) SEE @1,1 }
+ }
+ 
+ ###############################################################################
diff --git a/pkgs/by-name/tk/tkdiff/package.nix b/pkgs/by-name/tk/tkdiff/package.nix
index 478ee4e29ff9..329b7144202e 100644
--- a/pkgs/by-name/tk/tkdiff/package.nix
+++ b/pkgs/by-name/tk/tkdiff/package.nix
@@ -9,9 +9,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-EpbIdjsejkkTaSpoZRM5AHz0r1Cio+YzRryK0BoghBk=";
   };
 
-  # fix regression: allow /dev/null again. eg: "tkdiff /dev/null file"
-  # svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk
-  patches = [ ./189.patch ];
+  patches = [
+    # fix regression: allow /dev/null again. eg: "tkdiff /dev/null file"
+    # svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk
+    ./189.patch
+
+    # fix regression: trigger redraw when inline recursive diff requested
+    # svn diff --git -r193:194 https://svn.code.sf.net/p/tkdiff/code/trunk | \
+    #   sed -e '/^@@ -4545,7/,14d' -e '/^@@ -18063,7/,$d'
+    ./194.patch
+  ];
 
   nativeBuildInputs = [ makeBinaryWrapper ];