Further adaptation for OSX. Aquamacs is out of the
way, using GNU Emacs 24.4 now.