fix up to emacs-24.4