fix code for newer emacs
Merge branch 'master' into next