modified for Emacs 24.4
modified for Emacs 24.4