Eli Zaretskii <eliz@gnu.org> writes:

>> Iʼd really like to remove that workaround, but I could leave it in,
>> conditioned on (eq system-type 'windows-nt) or similar.
>
> Conditioning is fine with me.  We could also look at
>
>   (car (x-server-version))
>
> It should be 5 or less for XP and older systems.

This is what I have so far.