made it work with emacs  24.3.1