Changes to get working with Emacs 24.x as posted by Glenn Morris to
emacs support thread:
  https://lists.gnu.org/archive/html/bug-gnu-emacs/2013-05/msg00670.html