Dear Stefan,

Please find here an update patch file, then.  Thanks for your comments!

BTW, could this go to the "emacs-27" branch, please?

Best regards,
Fabrice