Merge changes in Emacs21.