> Could you please re-send your patch, diffed, as an attachment please?

The important part of the original post was output from "diff -Naur".
Does gmail mangle message bodies, or was the request due to the
other small manual adjustments (non-patch) noted in the original post?
Anyway, a 100% patch is attached for use by "patch -p1".

--