Updated emacs setting for emacs 24.4