pyrox.dev
Merge pull request #264533 from robert-manchester/tkdiff_redraw_trigger
tkdiff: trigger redraw when inline recursive diff requested
authored by
Peder Bergebakken Sundt
and committed by
GitHub
bd6a36b5
85713068
+15
pkgs/by-name/tk/tkdiff/194.patch
+15
pkgs/by-name/tk/tkdiff/194.patch
···
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
+
###############################################################################
+10
-3
pkgs/by-name/tk/tkdiff/package.nix
+10
-3
pkgs/by-name/tk/tkdiff/package.nix
···
9
9
hash = "sha256-EpbIdjsejkkTaSpoZRM5AHz0r1Cio+YzRryK0BoghBk=";
10
10
};
11
11
12
-
# fix regression: allow /dev/null again. eg: "tkdiff /dev/null file"
13
-
# svn diff --git -r188:189 https://svn.code.sf.net/p/tkdiff/code/trunk
14
-
patches = [ ./189.patch ];
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
+
];
15
22
16
23
nativeBuildInputs = [ makeBinaryWrapper ];
17
24