Update Emacs to 24.4
Merge pull request #6876 from nayefc/patch-1

Update Emacs to 24.4