Hi,

I've created the attached patch already 2 weeks ago, unfortunately it
doesn't apply any more to the master branch. Could you please integrate
it into the emacs-28 branch? Or do you prefer, that I create a new patch
for master?

Kind regards,
-- 
           Peter