Upstream changes from Emacs package:
spelling and obsolete variables.