Eli Zaretskii <eliz@gnu.org> writes:

> I don't think this has been fixed, because I can reproduce this
> variant of the bug with the current master branch: [...]

Absolutely correct - I noticed that I had a fix in my local build.

Here is a patch: