Eli Zaretskii <eliz@gnu.org> writes:

> Ah, sorry I missed that.  Still, what is the FIXME there? why not
> simply remove that part?

Ok. Now it's removed. New patch attached.

Thank you for your comments.