Bring up-to-date with changes in the Emacs wiki.

Fixes breakage with Emacs 24.4.