Various changes made in Emacs trunk