> On 2022-07-08,, at 8:55 , Eli Zaretskii <eliz@gnu.org> wrote:
> 
> This is very old code (I see it in Emacs 21),

Ugh.  Will not happen again :-).

> with a FIXME comment
> since those days, which AFAIU was written with exactly this issue in
> mind.  If there are no problems with the fix below, I think it should
> be moved to master.

Three thumbs up!