Updated the patch again to apply cleanly.

Also added Yuan. (Side note: perhaps emacs-devel feature should be renamed to emacs-defun?)