tkdiff: patch to trigger recursive inline diffs
add patch to fix regression to trigger recursive inline diffs when selected
This commit is contained in:
parent
52f32fe37c
commit
3d8ba076a5
2 changed files with 25 additions and 3 deletions
15
pkgs/by-name/tk/tkdiff/194.patch
Normal file
15
pkgs/by-name/tk/tkdiff/194.patch
Normal file
|
@ -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 }
|
||||||
|
}
|
||||||
|
|
||||||
|
###############################################################################
|
|
@ -9,9 +9,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
hash = "sha256-EpbIdjsejkkTaSpoZRM5AHz0r1Cio+YzRryK0BoghBk=";
|
hash = "sha256-EpbIdjsejkkTaSpoZRM5AHz0r1Cio+YzRryK0BoghBk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# fix regression: allow /dev/null again. eg: "tkdiff /dev/null file"
|
patches = [
|
||||||
# svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk
|
# fix regression: allow /dev/null again. eg: "tkdiff /dev/null file"
|
||||||
patches = [ ./189.patch ];
|
# 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 ];
|
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue