Changes for emacs 24.4