> From: Spencer Baugh <sbaugh@janestreet.com>
> Cc: Eshel Yaron <me@eshelyaron.com>,  gerd.moellmann@gmail.com,  Eli
>   Zaretskii <eliz@gnu.org>,  69809@debbugs.gnu.org,  sbaugh@catern.com
> Date: Wed, 24 Jul 2024 12:25:00 -0400
>
> >  Spencer please have a look and push it if you agree.
>
> Yes, this seems good to me, thank you for the improved patch!
>
> I unfortunately don't have commit access, so perhaps someone else can
> install the patch.

I tried installing the last patch posted by João, but it failed to
apply, even with the -3 option and with options that ignore whitespace
changes.

João, please either install this on the emacs-30 branch or post an
updated patch that will apply cleanly.