> It looks like this patch has been severely mangled?  There's
 > characters like ^X in it (where there should be a `, I think)?

I'm sending them again, if it won't work, could you download them from:
https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-05/msg00618.html
?