Emacs 24.x compatibility