Moritz Bunkus <moritz@bunkus.org> writes:

>> Ah, you're right, it's not like #18871.  But I think it's the same as
>> one of the edge cases Vincent brought up during Bug#33887, and the
>> second patch in https://debbugs.gnu.org/33887#73 should fix it:
>
> That patch does indeed fix the issue for me. Thanks a lot!

Updated patch for another edge case (https://debbugs.gnu.org/33887#127).