Modified for Emacs24

Please, check this pull request, and if you want, accept it.