> OK, I think I managed to push a proper fix to `emacs-30`, tho
> very laboriously.  Clearly lack of sleep does not impact my
> cognitive abilities.

Thanks, three commits :p