Thanks! Since this is all fixes. I pushed to emacs-30.

Yuan