Preparation for emacs 24.4