Skip to content

Commit d2c3a8d

Browse files
committed
fix: update fypp linemarker-resync patch header for fypp 3.2
The original patch was written against an older fypp version where the target hunk began at line 1842 with 11 old / 16 new lines. In fypp 3.2 the same code sits at line 1848 and the hunk is smaller (7 old / 13 new), causing 'patch' to reject the file as malformed and emit a startup warning on every mfc.sh invocation. Regenerated the patch directly from the installed fypp 3.2 source. The actual change (adding 'or True' to always emit resync linemarkers after single-line $: calls) is identical.
1 parent 1139cc4 commit d2c3a8d

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
--- a/fypp.py
2-
+++ b/fypp.py
3-
@@ -1842,11 +1842,16 @@ class _Renderer:
4-
if self._linenums:
5-
# Last line was folded, but no linenums were generated for
6-
# the continuation lines -> current line position is not
7-
# in sync with the one calculated from the last line number
8-
unsync = (
9-
len(foldedlines) and len(foldedlines[-1]) > 1
1+
--- a/fypp.py 2026-05-14 18:22:07.622131094 -0400
2+
+++ b/fypp.py 2026-05-14 18:22:07.650131330 -0400
3+
@@ -1848,7 +1848,13 @@
104
and not self._contlinenums)
115
# Eval directive in source consists of more than one line
126
multiline = span[1] - span[0] > 1
@@ -21,5 +15,3 @@
2115
# For inline eval directives span[0] == span[1]
2216
# -> next line is span[0] + 1 and not span[1] as for
2317
# line eval directives
24-
nextline = max(span[1], span[0] + 1)
25-
trailing += self._linenumdir(nextline, fname)

0 commit comments

Comments
 (0)