[PATCH] Sync with Emacs CVS