Attached is a new version of the patch.  The only change is that it was rebased onto latest emacs-29 so that it applies cleanly.