changes after upgrade to emacs 24 / aquamacs 3.1a