update for emacs 24.4 in mac
mac-bak
Merge branch 'mac'