Eli Zaretskii <eliz@gnu.org> writes:

> Thanks.

Thank you!  How does the attached patch look to you?