Emacs: surround has been renamed