Thanks! Merged to emacs-30.

Yuan