emacs 24.4 fixes