> so I could get up to date with trunk, then applied parts of the patch file
> using diff-mode. Clearly somewhere in there the line endings were

Ah, maybe it's diff-mode's fault, then.