added back some emacs24 functionality