Rebased on emacs-29.

Theo