diff options
| author | Rob <86313040+robert-manchester@users.noreply.github.com> | 2023-10-31 00:36:22 -0700 |
|---|---|---|
| committer | Rob <86313040+robert-manchester@users.noreply.github.com> | 2023-10-31 11:01:37 -0700 |
| commit | 3d8ba076a53fa8738c5fe25f565d9eccaf36228c (patch) | |
| tree | adfa8a318865ac358f7ac8e16a41465eaf0b796c /pkgs/by-name/tk | |
| parent | 52f32fe37c1a819f735bbd5ab3f80d74c8cc034e (diff) | |
tkdiff: patch to trigger recursive inline diffs
add patch to fix regression to trigger recursive inline diffs when selected
Diffstat (limited to 'pkgs/by-name/tk')
| -rw-r--r-- | pkgs/by-name/tk/tkdiff/194.patch | 15 | ||||
| -rw-r--r-- | pkgs/by-name/tk/tkdiff/package.nix | 13 |
2 files changed, 25 insertions, 3 deletions
diff --git a/pkgs/by-name/tk/tkdiff/194.patch b/pkgs/by-name/tk/tkdiff/194.patch new file mode 100644 index 0000000000000..0fc50db3028bd --- /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 478ee4e29ff9e..329b7144202e3 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 ]; |