Eli Zaretskii <eliz@gnu.org> writes:

> Thanks, this LGTM.  Could you please rebase on the current HEAD of the
> master branch and resubmit?  The patch doesn't apply otherwise.

Thanks Eli.  Here a new version compiled and (lighly) tested.